Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 03:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

i2c: pxa: Use devm_ variants in probe function

Browse Source 
This patch cleans up i2c_pxa_probe() function,

 - Use devm_ variants wherever
   This will clean both probe exit and i2c_pxa_remove() functions

 - Check platform resource before parsing any other data from DT/platform

 - Use dev_err on failure from i2c_add_numbered_adapter()

 - Use pr_info instead of printk for KERN_INFO

Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
[wsa: removed unneeded error prinout after devm_ioremap_resource]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Vaibhav Hiremath 2015-07-14 13:06:45 +05:30 committed by Wolfram Sang
parent 3a2dc1677b
commit 51fcce86a7
1 changed files with 26 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
drivers/i2c/busses/i2c-pxa.c
View File

@ -1158,10 +1158,19 @@ static int i2c_pxa_probe(struct platform_device *dev)
struct resource *res = NULL; struct resource *res = NULL;
int ret, irq; int ret, irq;
i2c = kzalloc(sizeof(struct pxa_i2c), GFP_KERNEL); i2c = devm_kzalloc(&dev->dev, sizeof(struct pxa_i2c), GFP_KERNEL);
if (!i2c) { if (!i2c)
ret = -ENOMEM; return -ENOMEM;
goto emalloc;
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
i2c->reg_base = devm_ioremap_resource(&dev->dev, res);
if (IS_ERR(i2c->reg_base))
return PTR_ERR(i2c->reg_base);
irq = platform_get_irq(dev, 0);
if (irq < 0) {
dev_err(&dev->dev, "no irq resource: %d\n", irq);
return irq;
} }
/* Default adapter num to device id; i2c_pxa_probe_dt can override. */ /* Default adapter num to device id; i2c_pxa_probe_dt can override. */
@ -1171,19 +1180,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
if (ret > 0) if (ret > 0)
ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type); ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type);
if (ret < 0) if (ret < 0)
goto eclk; return ret;
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
irq = platform_get_irq(dev, 0);
if (res == NULL || irq < 0) {
ret = -ENODEV;
goto eclk;
}
if (!request_mem_region(res->start, resource_size(res), res->name)) {
ret = -ENOMEM;
goto eclk;
}
i2c->adap.owner = THIS_MODULE; i2c->adap.owner = THIS_MODULE;
i2c->adap.retries = 5; i2c->adap.retries = 5;
@ -1193,16 +1190,10 @@ static int i2c_pxa_probe(struct platform_device *dev)
strlcpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name)); strlcpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name));
i2c->clk = clk_get(&dev->dev, NULL); i2c->clk = devm_clk_get(&dev->dev, NULL);
if (IS_ERR(i2c->clk)) { if (IS_ERR(i2c->clk)) {
ret = PTR_ERR(i2c->clk); dev_err(&dev->dev, "failed to get the clk: %ld\n", PTR_ERR(i2c->clk));
goto eclk; return PTR_ERR(i2c->clk);
}
i2c->reg_base = ioremap(res->start, resource_size(res));
if (!i2c->reg_base) {
ret = -EIO;
goto eremap;
} }
i2c->reg_ibmr = i2c->reg_base + pxa_reg_layout[i2c_type].ibmr; i2c->reg_ibmr = i2c->reg_base + pxa_reg_layout[i2c_type].ibmr;
@ -1244,11 +1235,13 @@ static int i2c_pxa_probe(struct platform_device *dev)
i2c->adap.algo = &i2c_pxa_pio_algorithm; i2c->adap.algo = &i2c_pxa_pio_algorithm;
} else { } else {
i2c->adap.algo = &i2c_pxa_algorithm; i2c->adap.algo = &i2c_pxa_algorithm;
ret = request_irq(irq, i2c_pxa_handler, ret = devm_request_irq(&dev->dev, irq, i2c_pxa_handler,
IRQF_SHARED | IRQF_NO_SUSPEND, IRQF_SHARED | IRQF_NO_SUSPEND,
dev_name(&dev->dev), i2c); dev_name(&dev->dev), i2c);
if (ret) if (ret) {
dev_err(&dev->dev, "failed to request irq: %d\n", ret);
goto ereqirq; goto ereqirq;
}
} }
i2c_pxa_reset(i2c); i2c_pxa_reset(i2c);
@ -1261,33 +1254,22 @@ static int i2c_pxa_probe(struct platform_device *dev)
ret = i2c_add_numbered_adapter(&i2c->adap); ret = i2c_add_numbered_adapter(&i2c->adap);
if (ret < 0) { if (ret < 0) {
printk(KERN_INFO "I2C: Failed to add bus\n"); dev_err(&dev->dev, "failed to add bus: %d\n", ret);
goto eadapt; goto ereqirq;
} }
platform_set_drvdata(dev, i2c); platform_set_drvdata(dev, i2c);
#ifdef CONFIG_I2C_PXA_SLAVE #ifdef CONFIG_I2C_PXA_SLAVE
printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n", dev_info(&i2c->adap.dev, " PXA I2C adapter, slave address %d\n",
dev_name(&i2c->adap.dev), i2c->slave_addr); i2c->slave_addr);
#else #else
printk(KERN_INFO "I2C: %s: PXA I2C adapter\n", dev_info(&i2c->adap.dev, " PXA I2C adapter\n");
dev_name(&i2c->adap.dev));
#endif #endif
return 0; return 0;
eadapt:
if (!i2c->use_pio)
free_irq(irq, i2c);
ereqirq: ereqirq:
clk_disable_unprepare(i2c->clk); clk_disable_unprepare(i2c->clk);
iounmap(i2c->reg_base);
eremap:
clk_put(i2c->clk);
eclk:
kfree(i2c);
emalloc:
release_mem_region(res->start, resource_size(res));
return ret; return ret;
} }
@ -1296,15 +1278,8 @@ static int i2c_pxa_remove(struct platform_device *dev)
struct pxa_i2c *i2c = platform_get_drvdata(dev); struct pxa_i2c *i2c = platform_get_drvdata(dev);
i2c_del_adapter(&i2c->adap); i2c_del_adapter(&i2c->adap);
if (!i2c->use_pio)
free_irq(i2c->irq, i2c);
clk_disable_unprepare(i2c->clk); clk_disable_unprepare(i2c->clk);
clk_put(i2c->clk);
iounmap(i2c->reg_base);
release_mem_region(i2c->iobase, i2c->iosize);
kfree(i2c);
return 0; return 0;
} }