dmaengine: Use device_get_match_data()

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>
Link: https://lore.kernel.org/r/20231006213844.333027-1-robh@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index 78ceaa71675fe798b93515487bb9cccf4a849b14..2638290e4199c955f42486c503cab71ef857da2c 100644 (file)
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -13,13 +13,11 @@
 #include <linux/interrupt.h>
 #include <linux/clk.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
 #include <linux/of_dma.h>
 #include <linux/dma-mapping.h>
 #include <linux/pm_runtime.h>
 #include <linux/pm_domain.h>
+#include <linux/property.h>
 
 #include "fsl-edma-common.h"
 
@@ -414,8 +412,6 @@ static int fsl_edma3_attach_pd(struct platform_device *pdev, struct fsl_edma_eng
 
 static int fsl_edma_probe(struct platform_device *pdev)
 {
-       const struct of_device_id *of_id =
-                       of_match_device(fsl_edma_dt_ids, &pdev->dev);
        struct device_node *np = pdev->dev.of_node;
        struct fsl_edma_engine *fsl_edma;
        const struct fsl_edma_drvdata *drvdata = NULL;
@@ -424,8 +420,7 @@ static int fsl_edma_probe(struct platform_device *pdev)
        int chans;
        int ret, i;
 
-       if (of_id)
-               drvdata = of_id->data;
+       drvdata = device_get_match_data(&pdev->dev);
        if (!drvdata) {
                dev_err(&pdev->dev, "unable to find driver data\n");
                return -EINVAL;

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index fbde356881214676826b32418bc7349c90be9d73..9fff54b12db7a3ca9134241b0c858ce912f9e303 100644 (file)
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -14,9 +14,9 @@
 #include <linux/slab.h>
 #include <linux/dmaengine.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/device.h>
 #include <linux/genalloc.h>
-#include <linux/of_device.h>
 #include <linux/of_dma.h>
 
 #include "dmaengine.h"
@@ -642,11 +642,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
        int chan_num = TDMA_CHANNEL_NUM;
        struct gen_pool *pool = NULL;
 
-       of_id = of_match_device(mmp_tdma_dt_ids, &pdev->dev);
-       if (of_id)
-               type = (uintptr_t) of_id->data;
-       else
-               type = platform_get_device_id(pdev)->driver_data;
+       type = (enum mmp_tdma_type)device_get_match_data(&pdev->dev);
 
        /* always have couple channels */
        tdev = devm_kzalloc(&pdev->dev, sizeof(*tdev), GFP_KERNEL);
@@ -724,32 +720,22 @@ static int mmp_tdma_probe(struct platform_device *pdev)
                return ret;
        }
 
-       if (pdev->dev.of_node) {
-               ret = of_dma_controller_register(pdev->dev.of_node,
-                                                       mmp_tdma_xlate, tdev);
-               if (ret) {
-                       dev_err(tdev->device.dev,
-                               "failed to register controller\n");
-                       return ret;
-               }
+       ret = of_dma_controller_register(pdev->dev.of_node,
+                                        mmp_tdma_xlate, tdev);
+       if (ret) {
+               dev_err(tdev->device.dev, "failed to register controller\n");
+               return ret;
        }
 
        dev_info(tdev->device.dev, "initialized\n");
        return 0;
 }
 
-static const struct platform_device_id mmp_tdma_id_table[] = {
-       { "mmp-adma",   MMP_AUD_TDMA },
-       { "pxa910-squ", PXA910_SQU },
-       { },
-};
-
 static struct platform_driver mmp_tdma_driver = {
        .driver         = {
                .name   = "mmp-tdma",
                .of_match_table = mmp_tdma_dt_ids,
        },
-       .id_table       = mmp_tdma_id_table,
        .probe          = mmp_tdma_probe,
        .remove_new     = mmp_tdma_remove,
 };

diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 23b232b5751844f8329a1f4c62fd3294e5de5391..bcd3b623ac6c20a4aee0d2973b0aa308d99743f1 100644 (file)
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -10,8 +10,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
-#include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/memory.h>
 #include <linux/clk.h>
 #include <linux/of.h>
@@ -1328,13 +1328,8 @@ static int mv_xor_probe(struct platform_device *pdev)
         * setting up. In non-dt case it can only be the legacy one.
         */
        xordev->xor_type = XOR_ORION;
-       if (pdev->dev.of_node) {
-               const struct of_device_id *of_id =
-                       of_match_device(mv_xor_dt_ids,
-                                       &pdev->dev);
-
-               xordev->xor_type = (uintptr_t)of_id->data;
-       }
+       if (pdev->dev.of_node)
+               xordev->xor_type = (uintptr_t)device_get_match_data(&pdev->dev);
 
        /*
         * (Re-)program MBUS remapping windows if we are asked to.

diff --git a/drivers/dma/st_fdma.c b/drivers/dma/st_fdma.c
index 145bd0f2496e48f79f254f3dfd15a93dc63b69e8..8880b5e336f8d4afa80901d79aaf38b4a7218446 100644 (file)
--- a/drivers/dma/st_fdma.c
+++ b/drivers/dma/st_fdma.c
@@ -10,9 +10,10 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/of_dma.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/interrupt.h>
 #include <linux/remoteproc.h>
 #include <linux/slab.h>
@@ -739,18 +740,11 @@ static void st_fdma_free(struct st_fdma_dev *fdev)
 static int st_fdma_probe(struct platform_device *pdev)
 {
        struct st_fdma_dev *fdev;
-       const struct of_device_id *match;
        struct device_node *np = pdev->dev.of_node;
        const struct st_fdma_driverdata *drvdata;
        int ret, i;
 
-       match = of_match_device((st_fdma_match), &pdev->dev);
-       if (!match || !match->data) {
-               dev_err(&pdev->dev, "No device match found\n");
-               return -ENODEV;
-       }
-
-       drvdata = match->data;
+       drvdata = device_get_match_data(&pdev->dev);
 
        fdev = devm_kzalloc(&pdev->dev, sizeof(*fdev), GFP_KERNEL);
        if (!fdev)