提交 88d968b2 编写于 作者: R Russell King

ARM: PNX4008: Make ioaddr 'void __iomem *' rather than 'u32'

This avoids unnecessary casting.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 2781681e
...@@ -612,8 +612,8 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev) ...@@ -612,8 +612,8 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
goto out_clkget; goto out_clkget;
} }
if (!(alg_data->ioaddr = alg_data->ioaddr = ioremap(alg_data->base, I2C_PNX_REGION_SIZE);
(u32)ioremap(alg_data->base, I2C_PNX_REGION_SIZE))) { if (!alg_data->ioaddr) {
dev_err(&pdev->dev, "Couldn't ioremap I2C I/O region\n"); dev_err(&pdev->dev, "Couldn't ioremap I2C I/O region\n");
ret = -ENOMEM; ret = -ENOMEM;
goto out_release; goto out_release;
...@@ -671,7 +671,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev) ...@@ -671,7 +671,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
out_clock: out_clock:
clk_disable(alg_data->clk); clk_disable(alg_data->clk);
out_unmap: out_unmap:
iounmap((void *)alg_data->ioaddr); iounmap(alg_data->ioaddr);
out_release: out_release:
release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE); release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
out_clkget: out_clkget:
...@@ -691,7 +691,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev) ...@@ -691,7 +691,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev)
free_irq(alg_data->irq, i2c_pnx->adapter); free_irq(alg_data->irq, i2c_pnx->adapter);
i2c_del_adapter(adap); i2c_del_adapter(adap);
clk_disable(alg_data->clk); clk_disable(alg_data->clk);
iounmap((void *)alg_data->ioaddr); iounmap(alg_data->ioaddr);
release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE); release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
clk_put(alg_data->clk); clk_put(alg_data->clk);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
......
...@@ -26,7 +26,7 @@ struct i2c_pnx_mif { ...@@ -26,7 +26,7 @@ struct i2c_pnx_mif {
struct i2c_pnx_algo_data { struct i2c_pnx_algo_data {
u32 base; u32 base;
u32 ioaddr; void __iomem *ioaddr;
int irq; int irq;
struct i2c_pnx_mif mif; struct i2c_pnx_mif mif;
int last; int last;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册