diff options
| author | Jingchang Lu <b35083@freescale.com> | 2013-08-07 13:05:38 +0400 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2013-08-15 18:12:14 +0400 |
| commit | 0fc1347a7fdbcc25204f737998b824fc46662afd (patch) | |
| tree | fde085cafd0e4c54036cc7e6f81ccbb7c8187e4e /drivers/i2c | |
| parent | 46f2832b9f66b008fb813fe153f27794412fbc4f (diff) | |
| download | linux-0fc1347a7fdbcc25204f737998b824fc46662afd.tar.xz | |
i2c: imx: don't change platform device id_entry directly
The id_entry field should be changed by platform driver core,
driver should prevent changing it derectly. Use local variable
to save and extract platform_device_id info of the dts devices
instead.
Signed-off-by: Jingchang Lu <b35083@freescale.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 7adb35115d95..cbea84bfb0e8 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -499,6 +499,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) struct imx_i2c_struct *i2c_imx; struct resource *res; struct imxi2c_platform_data *pdata = pdev->dev.platform_data; + const struct platform_device_id *imx_id; void __iomem *base; int irq, ret; u32 bitrate; @@ -524,8 +525,11 @@ static int __init i2c_imx_probe(struct platform_device *pdev) } if (of_id) - pdev->id_entry = of_id->data; - i2c_imx->devtype = pdev->id_entry->driver_data; + imx_id = of_id->data; + else + imx_id = platform_get_device_id(pdev); + + i2c_imx->devtype = imx_id->driver_data; /* Setup i2c_imx driver structure */ strlcpy(i2c_imx->adapter.name, pdev->name, sizeof(i2c_imx->adapter.name)); |