3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/usb/imx/imx-usb-misc.c b/drivers/usb/imx/imx-usb-misc.c
index ed44d78b0f..be95b89aff 100644
--- a/drivers/usb/imx/imx-usb-misc.c
+++ b/drivers/usb/imx/imx-usb-misc.c
@@ -474,43 +474,43 @@ static __maybe_unused struct of_device_id imx_usbmisc_dt_ids[] = {
 #ifdef CONFIG_ARCH_IMX25
 	{
 		.compatible = "fsl,imx25-usbmisc",
-		.data = (unsigned long)&mx25_data,
+		.data = &mx25_data,
 	},
 #endif
 #ifdef CONFIG_ARCH_IMX27
 	{
 		.compatible = "fsl,imx27-usbmisc",
-		.data = (unsigned long)&mx27_mx31_data,
+		.data = &mx27_mx31_data,
 	},
 #endif
 #ifdef CONFIG_ARCH_IMX31
 	{
 		.compatible = "fsl,imx31-usbmisc",
-		.data = (unsigned long)&mx27_mx31_data,
+		.data = &mx27_mx31_data,
 	},
 #endif
 #ifdef CONFIG_ARCH_IMX35
 	{
 		.compatible = "fsl,imx35-usbmisc",
-		.data = (unsigned long)&mx35_data,
+		.data = &mx35_data,
 	},
 #endif
 #ifdef CONFIG_ARCH_IMX51
 	{
 		.compatible = "fsl,imx51-usbmisc",
-		.data = (unsigned long)&mx5_data,
+		.data = &mx5_data,
 	},
 #endif
 #ifdef CONFIG_ARCH_IMX53
 	{
 		.compatible = "fsl,imx53-usbmisc",
-		.data = (unsigned long)&mx5_data,
+		.data = &mx5_data,
 	},
 #endif
 #ifdef CONFIG_ARCH_IMX6
 	{
 		.compatible = "fsl,imx6q-usbmisc",
-		.data = (unsigned long)&mx6_data,
+		.data = &mx6_data,
 	},
 #endif
 	{
@@ -548,7 +548,7 @@ static int imx_usbmisc_probe(struct device_d *dev)
 	struct imx_usb_misc_data *devtype;
 	int ret;
 
-	ret = dev_get_drvdata(dev, (unsigned long *)&devtype);
+	ret = dev_get_drvdata(dev, (const void **)&devtype);
 	if (ret)
 		return ret;
 
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 36a316ab37..bf676a19c6 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -357,7 +357,7 @@ static int dsps_probe(struct device_d *dev)
 	struct dsps_glue *glue;
 	int ret;
 
-	ret = dev_get_drvdata(dev, (unsigned long *)&wrp);
+	ret = dev_get_drvdata(dev, (const void **)&wrp);
 	if (ret)
 		return ret;
 
@@ -445,7 +445,7 @@ static const struct dsps_musb_wrapper am33xx_driver_data = {
 static __maybe_unused struct of_device_id musb_dsps_dt_ids[] = {
 	{
 		.compatible = "ti,musb-am33xx",
-		.data = (unsigned long) &am33xx_driver_data,
+		.data = &am33xx_driver_data,
 	}, {
 		/* sentinel */
 	},
diff --git a/drivers/usb/musb/phy-am335x-control.c b/drivers/usb/musb/phy-am335x-control.c
index a241c84fed..214ae71776 100644
--- a/drivers/usb/musb/phy-am335x-control.c
+++ b/drivers/usb/musb/phy-am335x-control.c
@@ -98,7 +98,7 @@ static const struct phy_control ctrl_am335x = {
 
 static __maybe_unused struct of_device_id omap_control_usb_dt_ids[] = {
 	{
-		.compatible = "ti,am335x-usb-ctrl-module", .data = (unsigned long)&ctrl_am335x
+		.compatible = "ti,am335x-usb-ctrl-module", .data = &ctrl_am335x
 	}, {
 		/* sentinel */
 	},
@@ -133,7 +133,7 @@ static int am335x_control_usb_probe(struct device_d *dev)
 	const struct phy_control *phy_ctrl;
 	int ret;
 
-	ret = dev_get_drvdata(dev, (unsigned long *)&phy_ctrl);
+	ret = dev_get_drvdata(dev, (const void **)&phy_ctrl);
 	if (ret)
 		return ret;