|
@@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev)
|
|
IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE);
|
|
IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE);
|
|
__raw_writel(cr, adapter_data->ioaddr + CR_OFFSET);
|
|
__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);
|
|
release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);
|
|
kfree(adapter_data);
|
|
kfree(adapter_data);
|
|
kfree(padapter);
|
|
kfree(padapter);
|
|
@@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev)
|
|
/* set the adapter enumeration # */
|
|
/* set the adapter enumeration # */
|
|
adapter_data->id = i2c_id++;
|
|
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) {
|
|
if (!adapter_data->ioaddr) {
|
|
ret = -ENOMEM;
|
|
ret = -ENOMEM;
|
|
goto release_region;
|
|
goto release_region;
|
|
@@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
unmap:
|
|
unmap:
|
|
- iounmap((void __iomem*)adapter_data->ioaddr);
|
|
|
|
|
|
+ iounmap(adapter_data->ioaddr);
|
|
|
|
|
|
release_region:
|
|
release_region:
|
|
release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);
|
|
release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);
|