diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
| commit | 4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f (patch) | |
| tree | 200fe335bd4bb4b2f29f3ff7149b4266b342f158 /drivers/bus | |
| parent | 67e4e8c056b1df440b44ff2af785f89de36883da (diff) | |
| parent | 377d261708d3057200c7ad9647fddb15169fea78 (diff) | |
| download | barebox-4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f.tar.gz barebox-4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f.tar.xz | |
Merge branch 'for-next/of-device-id'
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/imx-weim.c | 12 | ||||
| -rw-r--r-- | drivers/bus/mvebu-mbus.c | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 9b8848d0ad..bc090cf191 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -48,22 +48,22 @@ static struct of_device_id weim_id_table[] = { { /* i.MX1/21 */ .compatible = "fsl,imx1-weim", - .data = (unsigned long)&imx1_weim_devtype, + .data = &imx1_weim_devtype, }, { /* i.MX25/27/31/35 */ .compatible = "fsl,imx27-weim", - .data = (unsigned long)&imx27_weim_devtype, + .data = &imx27_weim_devtype, }, { /* i.MX50/53/6Q */ .compatible = "fsl,imx50-weim", - .data = (unsigned long)&imx50_weim_devtype, + .data = &imx50_weim_devtype, }, { /* i.MX51 */ .compatible = "fsl,imx51-weim", - .data = (unsigned long)&imx51_weim_devtype, + .data = &imx51_weim_devtype, }, { .compatible = "fsl,imx6q-weim", - .data = (unsigned long)&imx50_weim_devtype, + .data = &imx50_weim_devtype, }, { } }; @@ -134,7 +134,7 @@ static int weim_probe(struct device_d *dev) struct imx_weim *weim; 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/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index e189810354..735fa323c4 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -453,31 +453,31 @@ mv78xx0_mbus_data __maybe_unused = { static struct of_device_id mvebu_mbus_dt_ids[] = { #if defined(CONFIG_ARCH_ARMADA_370) || defined(CONFIG_ARCH_ARMADA_XP) { .compatible = "marvell,armada370-mbus", - .data = (u32)&armada_370_xp_mbus_data, }, + .data = &armada_370_xp_mbus_data, }, { .compatible = "marvell,armadaxp-mbus", - .data = (u32)&armada_370_xp_mbus_data, }, + .data = &armada_370_xp_mbus_data, }, #endif #if defined(CONFIG_ARCH_DOVE) { .compatible = "marvell,dove-mbus", - .data = (u32)&dove_mbus_data, }, + .data = &dove_mbus_data, }, #endif #if defined(CONFIG_ARCH_KIRKWOOD) { .compatible = "marvell,kirkwood-mbus", - .data = (u32)&kirkwood_mbus_data, }, + .data = &kirkwood_mbus_data, }, #endif #if defined(CONFIG_ARCH_ORION5X) { .compatible = "marvell,orion5x-88f5281-mbus", - .data = (u32)&orion5x_4win_mbus_data, }, + .data = &orion5x_4win_mbus_data, }, { .compatible = "marvell,orion5x-88f5182-mbus", - .data = (u32)&orion5x_2win_mbus_data, }, + .data = &orion5x_2win_mbus_data, }, { .compatible = "marvell,orion5x-88f5181-mbus", - .data = (u32)&orion5x_2win_mbus_data, }, + .data = &orion5x_2win_mbus_data, }, { .compatible = "marvell,orion5x-88f6183-mbus", - .data = (u32)&orion5x_4win_mbus_data, }, + .data = &orion5x_4win_mbus_data, }, #endif #if defined(CONFIG_ARCH_MV78XX0) { .compatible = "marvell,mv78xx0-mbus", - .data = (u32)&mv78xx0_mbus_data, }, + .data = &mv78xx0_mbus_data, }, #endif { }, }; |