spi: pxa2xx: Introduce temporary variables to increase readability
Subsystems (3)
Andy Shevchenko
reviewerPATCH 1/2 spi: pxa2xx: Introduce temporary variables to increase readability
The current conditional for PCI ID matching is hard to read. Introduce couple of temporary variables to increase readability of the code.
--- drivers/spi/spi-pxa2xx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/spi/spi-pxa2xx.c +6 -5
@@ -1516,13 +1516,14 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)struct pxa2xx_spi_controller *pdata;struct ssp_device *ssp;struct resource *res; +struct device *parent = pdev->dev.parent; +struct pci_dev *pcidev =dev_is_pci (parent) ?to_pci_dev (parent) :NULL ;const struct pci_device_id *pcidev_id =NULL ;enum pxa_ssp_type type;const void *match; -if (dev_is_pci (pdev->dev.parent)) - pcidev_id =pci_match_id (pxa2xx_spi_pci_compound_match, -to_pci_dev (pdev->dev.parent)); +if (pcidev) + pcidev_id =pci_match_id (pxa2xx_spi_pci_compound_match, pcidev); match =device_get_match_data (&pdev->dev);if (match)
@@ -1549,8 +1550,8 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)#ifdef CONFIG_PCI if (pcidev_id) { - pdata->tx_param = pdev->dev.parent; - pdata->rx_param = pdev->dev.parent; + pdata->tx_param = parent; + pdata->rx_param = parent; pdata->dma_filter = pxa2xx_spi_idma_filter; }#endif
Signature · 1 line
2.23.0
Andy Shevchenko
reviewerPATCH 2/2 spi: pxa2xx: Drop extra check of platform_get_resource() returned value
The devm_ioremap_resource() has already a check for resource pointer being NULL. No need to double check this.
Drop extra check of platform_get_resource() returned value.
--- drivers/spi/spi-pxa2xx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/spi/spi-pxa2xx.c +3 -5
@@ -1537,17 +1537,15 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)if (!pdata)return NULL ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return NULL ; - ssp = &pdata->ssp; - ssp->phys_base = res->start; + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); ssp->mmio_base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (ssp->mmio_base))return NULL ; + ssp->phys_base = res->start; +#ifdef CONFIG_PCI if (pcidev_id) { pdata->tx_param = parent;
Signature · 1 line
2.23.0
Mark Brown
maintainerApplied "spi: pxa2xx: Drop extra check of platform_get_resource() returned value" to the spi tree
The patch
spi: pxa2xx: Drop extra check of platform_get_resource() returned value
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.4
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
77c544d243f3b0d1ae3487ebb170c07c79734fe7Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Mon, 21 Oct 2019 13:36:25 +0300
Subject: [PATCH] spi: pxa2xx: Drop extra check of platform_get_resource()
returned value
The devm_ioremap_resource() has already a check for resource pointer being NULL. No need to double check this.
Drop extra check of platform_get_resource() returned value.
--- drivers/spi/spi-pxa2xx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/spi/spi-pxa2xx.c +3 -5
@@ -1545,17 +1545,15 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)if (!pdata)return NULL ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return NULL ; - ssp = &pdata->ssp; - ssp->phys_base = res->start; + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); ssp->mmio_base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (ssp->mmio_base))return NULL ; + ssp->phys_base = res->start; +#ifdef CONFIG_PCI if (pcidev_id) { pdata->tx_param = pdev->dev.parent;
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "spi: pxa2xx: Introduce temporary variables to increase readability" to the spi tree
In reply to Andy ShevchenkoThe patch
spi: pxa2xx: Introduce temporary variables to increase readability
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
6fb7427d84f6ed064776434436485cfb0f6711e9Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Mon, 21 Oct 2019 13:36:24 +0300
Subject: [PATCH] spi: pxa2xx: Introduce temporary variables to increase
readability
The current conditional for PCI ID matching is hard to read. Introduce couple of temporary variables to increase readability of the code.
--- drivers/spi/spi-pxa2xx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/spi/spi-pxa2xx.c +6 -5
@@ -1516,13 +1516,14 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)struct pxa2xx_spi_controller *pdata;struct ssp_device *ssp;struct resource *res; +struct device *parent = pdev->dev.parent; +struct pci_dev *pcidev =dev_is_pci (parent) ?to_pci_dev (parent) :NULL ;const struct pci_device_id *pcidev_id =NULL ;enum pxa_ssp_type type;const void *match; -if (dev_is_pci (pdev->dev.parent)) - pcidev_id =pci_match_id (pxa2xx_spi_pci_compound_match, -to_pci_dev (pdev->dev.parent)); +if (pcidev) + pcidev_id =pci_match_id (pxa2xx_spi_pci_compound_match, pcidev); match =device_get_match_data (&pdev->dev);if (match)
@@ -1549,8 +1550,8 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)#ifdef CONFIG_PCI if (pcidev_id) { - pdata->tx_param = pdev->dev.parent; - pdata->rx_param = pdev->dev.parent; + pdata->tx_param = parent; + pdata->rx_param = parent; pdata->dma_filter = pxa2xx_spi_idma_filter; }#endif
Signature · 1 line
2.20.1