Skip to content

Commit

Permalink
Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Dooks committed Jan 12, 2011
2 parents 7f42f9f + 747fcc9 commit 084b7c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/i2c/busses/i2c-iop3xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-iop3xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 084b7c8

Please sign in to comment.