diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-01-12 22:24:46 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-01-12 22:24:46 +0000 |
| commit | 084b7c83830fab95bd686e2b0b5321dec0300a96 (patch) | |
| tree | 1881005a1e01a10e4a2f8765628309dd4068e862 /drivers/i2c/busses | |
| parent | 7f42f9fef7bbc4f3250a33bf58170c640cd3db18 (diff) | |
| parent | 747fcc91cb5bade1f681b3a8d0e6d4f697d865fd (diff) | |
| download | kernel_samsung_espresso10-084b7c83830fab95bd686e2b0b5321dec0300a96.zip kernel_samsung_espresso10-084b7c83830fab95bd686e2b0b5321dec0300a96.tar.gz kernel_samsung_espresso10-084b7c83830fab95bd686e2b0b5321dec0300a96.tar.bz2 | |
Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638
Diffstat (limited to 'drivers/i2c/busses')
| -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 112c61f..f09c931 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) IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE); __raw_writel(cr, adapter_data->ioaddr + CR_OFFSET); - iounmap((void __iomem*)adapter_data->ioaddr); + iounmap(adapter_data->ioaddr); release_mem_region(res->start, IOP3XX_I2C_IO_SIZE); kfree(adapter_data); kfree(padapter); @@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) /* set the adapter enumeration # */ adapter_data->id = i2c_id++; - adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE); + adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE); if (!adapter_data->ioaddr) { ret = -ENOMEM; goto release_region; @@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) return 0; unmap: - iounmap((void __iomem*)adapter_data->ioaddr); + iounmap(adapter_data->ioaddr); release_region: 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 8485861..097e270 100644 --- a/drivers/i2c/busses/i2c-iop3xx.h +++ b/drivers/i2c/busses/i2c-iop3xx.h @@ -97,7 +97,7 @@ #define IOP3XX_I2C_IO_SIZE 0x18 struct i2c_algo_iop3xx_data { - u32 ioaddr; + void __iomem *ioaddr; wait_queue_head_t waitq; spinlock_t lock; u32 SR_enabled, SR_received; |