Merge branch 'for-next/of-device-id'

3 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index eba04a33a4..06d2fba412 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -99,7 +99,7 @@ static int imx_gpt_probe(struct device_d *dev)
 	if (timer_base)
 		return 0;
 
-	ret = dev_get_drvdata(dev, (unsigned long *)&regs);
+	ret = dev_get_drvdata(dev, (const void **)&regs);
 	if (ret)
 		return ret;
 
@@ -136,10 +136,10 @@ static int imx_gpt_probe(struct device_d *dev)
 static __maybe_unused struct of_device_id imx_gpt_dt_ids[] = {
 	{
 		.compatible = "fsl,imx1-gpt",
-		.data = (unsigned long)&regs_imx1,
+		.data = &regs_imx1,
 	}, {
 		.compatible = "fsl,imx31-gpt",
-		.data = (unsigned long)&regs_imx31,
+		.data = &regs_imx31,
 	}, {
 		/* sentinel */
 	}
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c
index 0a71db66d7..a8ef854700 100644
--- a/arch/arm/mach-imx/esdctl.c
+++ b/arch/arm/mach-imx/esdctl.c
@@ -312,7 +312,7 @@ static int imx_esdctl_probe(struct device_d *dev)
 	int ret;
 	void *base;
 
-	ret = dev_get_drvdata(dev, (unsigned long *)&data);
+	ret = dev_get_drvdata(dev, (const void **)&data);
 	if (ret)
 		return ret;
 
@@ -426,7 +426,7 @@ static struct platform_device_id imx_esdctl_ids[] = {
 static __maybe_unused struct of_device_id imx_esdctl_dt_ids[] = {
 	{
 		.compatible = "fsl,imx6q-mmdc",
-		.data = (unsigned long)&imx6q_data
+		.data = &imx6q_data
 	}, {
 		/* sentinel */
 	}
diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c
index d082d2d9a5..c5751fe111 100644
--- a/arch/arm/mach-imx/iim.c
+++ b/arch/arm/mach-imx/iim.c
@@ -395,7 +395,7 @@ static int imx_iim_probe(struct device_d *dev)
 
 	iim = xzalloc(sizeof(*iim));
 
-	dev_get_drvdata(dev, (unsigned long *)&drvdata);
+	dev_get_drvdata(dev, (const void **)&drvdata);
 
 	if (drvdata && drvdata->supply)
 		iim->supply = drvdata->supply;
@@ -471,13 +471,13 @@ static struct imx_iim_drvdata imx53_drvdata = {
 static __maybe_unused struct of_device_id imx_iim_dt_ids[] = {
 	{
 		.compatible = "fsl,imx53-iim",
-		.data = (unsigned long)&imx53_drvdata,
+		.data = &imx53_drvdata,
 	}, {
 		.compatible = "fsl,imx51-iim",
-		.data = (unsigned long)&imx51_drvdata,
+		.data = &imx51_drvdata,
 	}, {
 		.compatible = "fsl,imx27-iim",
-		.data = (unsigned long)&imx27_drvdata,
+		.data = &imx27_drvdata,
 	}, {
 		/* sentinel */
 	}