irqchip/ls-scfg-msi: Use device_get_match_data()

Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data in a single step without the unnecessary
intermediate match pointer.

With this, adjust the includes to explicitly include the correct
headers. That also serves as preparation to remove implicit includes within
the DT headers.  of_platform.h currently includes platform_device.h among
others.

Signed-off-by: Rob Herring <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Tested-by: Vladimir Oltean <[email protected]>
Reviewed-by: Vladimir Oltean <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scfg-msi.c
index f31a262fe438f0eaa6f89730027219e501884767..15cf80b463225c1a295e3d1c757d70e3fbfb17e5 100644 (file)
--- a/drivers/irqchip/irq-ls-scfg-msi.c
+++ b/drivers/irqchip/irq-ls-scfg-msi.c
@@ -17,7 +17,8 @@
 #include <linux/irqdomain.h>
 #include <linux/of_irq.h>
 #include <linux/of_pci.h>
-#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/spinlock.h>
 
 #define MSI_IRQS_PER_MSIR      32
@@ -334,20 +335,17 @@ MODULE_DEVICE_TABLE(of, ls_scfg_msi_id);
 
 static int ls_scfg_msi_probe(struct platform_device *pdev)
 {
-       const struct of_device_id *match;
        struct ls_scfg_msi *msi_data;
        struct resource *res;
        int i, ret;
 
-       match = of_match_device(ls_scfg_msi_id, &pdev->dev);
-       if (!match)
-               return -ENODEV;
-
        msi_data = devm_kzalloc(&pdev->dev, sizeof(*msi_data), GFP_KERNEL);
        if (!msi_data)
                return -ENOMEM;
 
-       msi_data->cfg = (struct ls_scfg_msi_cfg *) match->data;
+       msi_data->cfg = (struct ls_scfg_msi_cfg *)device_get_match_data(&pdev->dev);
+       if (!msi_data->cfg)
+               return -ENODEV;
 
        msi_data->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
        if (IS_ERR(msi_data->regs)) {