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

4 files changed, 18 insertions, 18 deletions

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 3a644cf62f..622c56d97b 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -387,22 +387,22 @@ static struct platform_device_id at91_twi_devtypes[] = {
 static struct of_device_id at91_twi_dt_ids[] = {
 	{
 		.compatible = "atmel,at91rm9200-i2c",
-		.data = (unsigned long) &at91rm9200_config,
+		.data = &at91rm9200_config,
 	} , {
 		.compatible = "atmel,at91sam9260-i2c",
-		.data = (unsigned long) &at91sam9260_config,
+		.data = &at91sam9260_config,
 	} , {
 		.compatible = "atmel,at91sam9261-i2c",
-		.data = (unsigned long) &at91sam9261_config,
+		.data = &at91sam9261_config,
 	} , {
 		.compatible = "atmel,at91sam9g20-i2c",
-		.data = (unsigned long) &at91sam9g20_config,
+		.data = &at91sam9g20_config,
 	} , {
 		.compatible = "atmel,at91sam9g10-i2c",
-		.data = (unsigned long) &at91sam9g10_config,
+		.data = &at91sam9g10_config,
 	}, {
 		.compatible = "atmel,at91sam9x5-i2c",
-		.data = (unsigned long) &at91sam9x5_config,
+		.data = &at91sam9x5_config,
 	}, {
 		/* sentinel */
 	}
@@ -417,7 +417,7 @@ static int at91_twi_probe(struct device_d *dev)
 
 	i2c_at91 = xzalloc(sizeof(struct at91_twi_dev));
 
-	rc = dev_get_drvdata(dev, (unsigned long *)&i2c_data);
+	rc = dev_get_drvdata(dev, (const void **)&i2c_data);
 	if (rc < 0) {
 		dev_err(dev, "failed to retrieve driver data\n");
 		goto out_free;
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 4fd3a6f778..0c38e64145 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -487,9 +487,9 @@ mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
  *****************************************************************************
  */
 static struct of_device_id mv64xxx_i2c_of_match_table[] = {
-	{ .compatible = "marvell,mv64xxx-i2c", .data = (unsigned long)&mv64xxx_i2c_regs_mv64xxx},
-	{ .compatible = "marvell,mv78230-i2c", .data = (unsigned long)&mv64xxx_i2c_regs_mv64xxx},
-	{ .compatible = "marvell,mv78230-a0-i2c", .data = (unsigned long)&mv64xxx_i2c_regs_mv64xxx},
+	{ .compatible = "marvell,mv64xxx-i2c", .data = &mv64xxx_i2c_regs_mv64xxx},
+	{ .compatible = "marvell,mv78230-i2c", .data = &mv64xxx_i2c_regs_mv64xxx},
+	{ .compatible = "marvell,mv78230-a0-i2c", .data = &mv64xxx_i2c_regs_mv64xxx},
 	{}
 };
 
@@ -573,7 +573,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
 		goto out;
 	}
 
-	dev_get_drvdata(pd, (unsigned long *)&mv64xxx_regs);
+	dev_get_drvdata(pd, (const void **)&mv64xxx_regs);
 	memcpy(&drv_data->reg_offsets, mv64xxx_regs,
 		sizeof(drv_data->reg_offsets));
 
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 96c3c2bc87..4308963b18 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1002,7 +1002,7 @@ i2c_omap_probe(struct device_d *pdev)
 		goto err_free_mem;
 	}
 
-	r = dev_get_drvdata(pdev, (unsigned long *)&i2c_data);
+	r = dev_get_drvdata(pdev, (const void **)&i2c_data);
 	if (r)
 		return r;
 
@@ -1137,7 +1137,7 @@ static struct platform_device_id omap_i2c_ids[] = {
 static __maybe_unused struct of_device_id omap_i2c_dt_ids[] = {
 	{
 		.compatible = "ti,omap3-i2c",
-		.data = (unsigned long)&omap3_data,
+		.data = &omap3_data,
 	}, {
 		.compatible = "ti,omap4-i2c",
 	}, {
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index f793cbeabf..f6a4b227f4 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -640,7 +640,7 @@ static int tegra_i2c_probe(struct device_d *dev)
 		i2c_dev->bus_clk_rate = 100000; /* default clock rate */
 
 	i2c_dev->hw = &tegra20_i2c_hw;
-	dev_get_drvdata(dev, (unsigned long *)&i2c_dev->hw);
+	dev_get_drvdata(dev, (const void **)&i2c_dev->hw);
 	i2c_dev->is_dvc = of_device_is_compatible(dev->device_node,
 	                                          "nvidia,tegra20-i2c-dvc");
 
@@ -676,16 +676,16 @@ static int tegra_i2c_probe(struct device_d *dev)
 static __maybe_unused struct of_device_id tegra_i2c_compatible[] = {
 	{
 		.compatible = "nvidia,tegra114-i2c",
-		.data = (unsigned long)&tegra114_i2c_hw,
+		.data = &tegra114_i2c_hw,
 	}, {
 		.compatible = "nvidia,tegra30-i2c",
-		.data = (unsigned long)&tegra30_i2c_hw,
+		.data = &tegra30_i2c_hw,
 	}, {
 		.compatible = "nvidia,tegra20-i2c",
-		.data = (unsigned long)&tegra20_i2c_hw,
+		.data = &tegra20_i2c_hw,
 	}, {
 		.compatible = "nvidia,tegra20-i2c-dvc",
-		.data = (unsigned long)&tegra20_i2c_hw,
+		.data = &tegra20_i2c_hw,
 	}, {
 		/* sentinel */
 	}