]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
spi: pxa2xx: Introduce temporary variables to increase readability
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 21 Oct 2019 10:36:24 +0000 (13:36 +0300)
committerMark Brown <broonie@kernel.org>
Fri, 25 Oct 2019 10:09:53 +0000 (11:09 +0100)
The current conditional for PCI ID matching is hard to read.
Introduce couple of temporary variables to increase readability
of the code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20191021103625.4250-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-pxa2xx.c

index 443c1f4d2a9adb091c4e8a01a29fd476a6ca3120..6eb6805ee51da1ebd53c136de5f8feeb994a8f7a 100644 (file)
@@ -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