spi: pxa2xx: Convert to use device_get_match_data()

Convert to use device_get_match_data() instead of open coded variant.

While here, switch of_property_read_bool() to device_property_read_bool().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20191018105429.82782-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 04ca80770e35a2ea066b94973180b09ca4b288c6..684a5585ac7fbf43ed0550d185b4bbdc53225d9c 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -22,6 +22,7 @@
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/property.h>
 #include <linux/slab.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/spi/spi.h>
@@ -1512,34 +1513,21 @@ static struct pxa2xx_spi_controller *
 pxa2xx_spi_init_pdata(struct platform_device *pdev)
 {
        struct pxa2xx_spi_controller *pdata;
-       struct acpi_device *adev;
        struct ssp_device *ssp;
        struct resource *res;
-       const struct acpi_device_id *adev_id = NULL;
        const struct pci_device_id *pcidev_id = NULL;
-       const struct of_device_id *of_id = NULL;
        enum pxa_ssp_type type;
+       const void *match;
 
-       adev = ACPI_COMPANION(&pdev->dev);
-
-       if (pdev->dev.of_node)
-               of_id = of_match_device(pdev->dev.driver->of_match_table,
-                                       &pdev->dev);
-       else if (dev_is_pci(pdev->dev.parent))
+       if (dev_is_pci(pdev->dev.parent))
                pcidev_id = pci_match_id(pxa2xx_spi_pci_compound_match,
                                         to_pci_dev(pdev->dev.parent));
-       else if (adev)
-               adev_id = acpi_match_device(pdev->dev.driver->acpi_match_table,
-                                           &pdev->dev);
-       else
-               return NULL;
 
-       if (adev_id)
-               type = (enum pxa_ssp_type)adev_id->driver_data;
+       match = device_get_match_data(&pdev->dev);
+       if (match)
+               type = (enum pxa_ssp_type)match;
        else if (pcidev_id)
                type = (enum pxa_ssp_type)pcidev_id->driver_data;
-       else if (of_id)
-               type = (enum pxa_ssp_type)of_id->data;
        else
                return NULL;
 
@@ -1572,7 +1560,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
        ssp->dev = &pdev->dev;
        ssp->port_id = pxa2xx_spi_get_port_id(&pdev->dev);
 
-       pdata->is_slave = of_property_read_bool(pdev->dev.of_node, "spi-slave");
+       pdata->is_slave = device_property_read_bool(&pdev->dev, "spi-slave");
        pdata->num_chipselect = 1;
        pdata->enable_dma = true;
        pdata->dma_burst_size = 1;