ARM: imx: 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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index 2157493b78a9bd3cbb98508b29d504ca5d196281..897e6def59ee75a5b6f5a5075d9d63eb39664264 100644 (file)
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -13,7 +13,8 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/perf_event.h>
 #include <linux/slab.h>
 
@@ -103,7 +104,7 @@ struct mmdc_pmu {
        struct device *dev;
        struct perf_event *mmdc_events[MMDC_NUM_COUNTERS];
        struct hlist_node node;
-       struct fsl_mmdc_devtype_data *devtype_data;
+       const struct fsl_mmdc_devtype_data *devtype_data;
        struct clk *mmdc_ipg_clk;
 };
 
@@ -474,8 +475,6 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
        struct mmdc_pmu *pmu_mmdc;
        char *name;
        int ret;
-       const struct of_device_id *of_id =
-               of_match_device(imx_mmdc_dt_ids, &pdev->dev);
 
        pmu_mmdc = kzalloc(sizeof(*pmu_mmdc), GFP_KERNEL);
        if (!pmu_mmdc) {
@@ -503,7 +502,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
                                GFP_KERNEL, "mmdc%d", ret);
 
        pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
-       pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
+       pmu_mmdc->devtype_data = device_get_match_data(&pdev->dev);
 
        hrtimer_init(&pmu_mmdc->hrtimer, CLOCK_MONOTONIC,
                        HRTIMER_MODE_REL);