EDAC/altera: Use device_get_match_data()
authorRob Herring <robh@kernel.org>
Wed, 15 Nov 2023 21:02:01 +0000 (15:02 -0600)
committerBorislav Petkov (AMD) <bp@alien8.de>
Mon, 20 Nov 2023 08:59:16 +0000 (09:59 +0100)
Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231115210201.3743564-1-robh@kernel.org
drivers/edac/altera_edac.c

index 8b31cd54bdb6de4a483fca1fbdc1499aa64321bb..541acf5eba05450eca02ca9026afbdf7589bee05 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/of_platform.h>
 #include <linux/panic_notifier.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/types.h>
 #include <linux/uaccess.h>
@@ -279,7 +280,6 @@ release:
 
 static int altr_sdram_probe(struct platform_device *pdev)
 {
-       const struct of_device_id *id;
        struct edac_mc_layer layers[2];
        struct mem_ctl_info *mci;
        struct altr_sdram_mc_data *drvdata;
@@ -290,10 +290,6 @@ static int altr_sdram_probe(struct platform_device *pdev)
        int irq, irq2, res = 0;
        unsigned long mem_size, irqflags = 0;
 
-       id = of_match_device(altr_sdram_ctrl_of_match, &pdev->dev);
-       if (!id)
-               return -ENODEV;
-
        /* Grab the register range from the sdr controller in device tree */
        mc_vbase = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
                                                   "altr,sdr-syscon");
@@ -304,8 +300,7 @@ static int altr_sdram_probe(struct platform_device *pdev)
        }
 
        /* Check specific dependencies for the module */
-       priv = of_match_node(altr_sdram_ctrl_of_match,
-                            pdev->dev.of_node)->data;
+       priv = device_get_match_data(&pdev->dev);
 
        /* Validate the SDRAM controller has ECC enabled */
        if (regmap_read(mc_vbase, priv->ecc_ctrl_offset, &read_reg) ||