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/spi/imx_spi.c | |
| 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/spi/imx_spi.c')
| -rw-r--r-- | drivers/spi/imx_spi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index e552d5fe01..be6a4fd592 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -539,7 +539,7 @@ static int imx_spi_probe(struct device_d *dev) struct spi_imx_devtype_data *devdata = NULL; int ret; - ret = dev_get_drvdata(dev, (unsigned long *)&devdata); + ret = dev_get_drvdata(dev, (const void **)&devdata); if (ret) return -ENODEV; @@ -587,19 +587,19 @@ static __maybe_unused struct of_device_id imx_spi_dt_ids[] = { #if IS_ENABLED(CONFIG_DRIVER_SPI_IMX_0_0) { .compatible = "fsl,imx27-cspi", - .data = (unsigned long)&spi_imx_devtype_data_0_0, + .data = &spi_imx_devtype_data_0_0, }, #endif #if IS_ENABLED(CONFIG_DRIVER_SPI_IMX_0_7) { .compatible = "fsl,imx35-cspi", - .data = (unsigned long)&spi_imx_devtype_data_0_7, + .data = &spi_imx_devtype_data_0_7, }, #endif #if IS_ENABLED(CONFIG_DRIVER_SPI_IMX_2_3) { .compatible = "fsl,imx51-ecspi", - .data = (unsigned long)&spi_imx_devtype_data_2_3, + .data = &spi_imx_devtype_data_2_3, }, #endif { |