openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c: octeon: Cleanup resource allocation code 

Remove resource values from struct i2c_octeon and use
devm_ioremap_resource helper.

Signed-off-by: Jan Glauber <jglauber@cavium.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Jan Glauber 2016-03-18 09:46:27 +01:00 committed by Wolfram Sang
parent dfcd821218
commit 54108e56a8
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/i2c/busses/i2c-octeon.c
View File

@ -75,9 +75,7 @@ struct octeon_i2c {
int irq; int irq;
u32 twsi_freq; u32 twsi_freq;
int sys_freq; int sys_freq;
resource_size_t twsi_phys;
void __iomem *twsi_base; void __iomem *twsi_base;
resource_size_t regsize;
struct device *dev; struct device *dev;
}; };
@ -502,14 +500,11 @@ static int octeon_i2c_probe(struct platform_device *pdev)
i2c->dev = &pdev->dev; i2c->dev = &pdev->dev;
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
i2c->twsi_base = devm_ioremap_resource(&pdev->dev, res_mem);
if (res_mem == NULL) { if (IS_ERR(i2c->twsi_base)) {
dev_err(i2c->dev, "found no memory resource\n"); result = PTR_ERR(i2c->twsi_base);
result = -ENXIO;
goto out; goto out;
} }
i2c->twsi_phys = res_mem->start;
i2c->regsize = resource_size(res_mem);
/* /*
* "clock-rate" is a legacy binding, the official binding is * "clock-rate" is a legacy binding, the official binding is
@ -526,13 +521,6 @@ static int octeon_i2c_probe(struct platform_device *pdev)
i2c->sys_freq = octeon_get_io_clock_rate(); i2c->sys_freq = octeon_get_io_clock_rate();
if (!devm_request_mem_region(&pdev->dev, i2c->twsi_phys, i2c->regsize,
res_mem->name)) {
dev_err(i2c->dev, "request_mem_region failed\n");
goto out;
}
i2c->twsi_base = devm_ioremap(&pdev->dev, i2c->twsi_phys, i2c->regsize);
init_waitqueue_head(&i2c->queue); init_waitqueue_head(&i2c->queue);
i2c->irq = irq; i2c->irq = irq;