diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2010-11-29 05:33:39 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-01-03 19:53:37 -0500 |
commit | 747fcc91cb5bade1f681b3a8d0e6d4f697d865fd (patch) | |
tree | 53da819407c6f1e8ab7739c500da1b0fda1480f7 /drivers | |
parent | 03ed6a3aa600c48593c3984812fda2d5945ddb46 (diff) |
i2c-iop3xx: add iomem annotation
Eliminate unnecessary casts and the following sparse warnings:
drivers/i2c/busses/i2c-iop3xx.c:65:9: warning: incorrect type in argument 1 (different base types)
drivers/i2c/busses/i2c-iop3xx.c:65:9: expected void const volatile [noderef] <asn:2>*<noident>
drivers/i2c/busses/i2c-iop3xx.c:65:9: got unsigned int
[ the previous warning is repeated 18 times ]
drivers/i2c/busses/i2c-iop3xx.c:456:33: warning: cast removes address space of expression
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 6 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index 112c61f7b8cd..f09c9319a2ba 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
@@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev) | |||
409 | IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE); | 409 | IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE); |
410 | __raw_writel(cr, adapter_data->ioaddr + CR_OFFSET); | 410 | __raw_writel(cr, adapter_data->ioaddr + CR_OFFSET); |
411 | 411 | ||
412 | iounmap((void __iomem*)adapter_data->ioaddr); | 412 | iounmap(adapter_data->ioaddr); |
413 | release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); | 413 | release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); |
414 | kfree(adapter_data); | 414 | kfree(adapter_data); |
415 | kfree(padapter); | 415 | kfree(padapter); |
@@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) | |||
453 | /* set the adapter enumeration # */ | 453 | /* set the adapter enumeration # */ |
454 | adapter_data->id = i2c_id++; | 454 | adapter_data->id = i2c_id++; |
455 | 455 | ||
456 | adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE); | 456 | adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE); |
457 | if (!adapter_data->ioaddr) { | 457 | if (!adapter_data->ioaddr) { |
458 | ret = -ENOMEM; | 458 | ret = -ENOMEM; |
459 | goto release_region; | 459 | goto release_region; |
@@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) | |||
498 | return 0; | 498 | return 0; |
499 | 499 | ||
500 | unmap: | 500 | unmap: |
501 | iounmap((void __iomem*)adapter_data->ioaddr); | 501 | iounmap(adapter_data->ioaddr); |
502 | 502 | ||
503 | release_region: | 503 | release_region: |
504 | release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); | 504 | release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); |
diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h index 8485861f6a36..097e270955d0 100644 --- a/drivers/i2c/busses/i2c-iop3xx.h +++ b/drivers/i2c/busses/i2c-iop3xx.h | |||
@@ -97,7 +97,7 @@ | |||
97 | #define IOP3XX_I2C_IO_SIZE 0x18 | 97 | #define IOP3XX_I2C_IO_SIZE 0x18 |
98 | 98 | ||
99 | struct i2c_algo_iop3xx_data { | 99 | struct i2c_algo_iop3xx_data { |
100 | u32 ioaddr; | 100 | void __iomem *ioaddr; |
101 | wait_queue_head_t waitq; | 101 | wait_queue_head_t waitq; |
102 | spinlock_t lock; | 102 | spinlock_t lock; |
103 | u32 SR_enabled, SR_received; | 103 | u32 SR_enabled, SR_received; |