diff options
| author |   Yipeng Yao <ypyao@marvell.com> | 2015-07-14 13:06:43 +0530 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2015-08-10 08:37:30 +0200 |
| commit | e2b498fd55a871ab3913914b982e3dd07d32e90e (patch) | |
| tree | 9215905bd7e1c001f552277664b4ed9f51080c74 /drivers/i2c | |
| parent | i2c: pxa: Return I2C_RETRY when timeout in pio mode (diff) | |
| download | linux-dev-e2b498fd55a871ab3913914b982e3dd07d32e90e.tar.xz linux-dev-e2b498fd55a871ab3913914b982e3dd07d32e90e.zip | |
i2c: pxa: Fix compile warning in 64bit mode
Fix below warning message, coming from 64 bit toolchain.
drivers/i2c/busses/i2c-pxa.c:1237:15:
warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
Signed-off-by: Yipeng Yao <ypyao@marvell.com>
[vaibhav.hiremath@linaro.org: Updated Changelog]
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Cc: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 632008f24098..d0cc058f42c3 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1116,7 +1116,9 @@ static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, i2c->use_pio = 1; if (of_get_property(np, "mrvl,i2c-fast-mode", NULL)) i2c->fast_mode = 1; - *i2c_types = (u32)(of_id->data); + + *i2c_types = (enum pxa_i2c_types)(of_id->data); + return 0; } |