diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-03-26 11:27:08 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 17:00:13 +0200 |
| commit | ac92f1517379299c03dc501b6a44be49cfcbcfe4 (patch) | |
| tree | 27cd79b7a35dfd520a782daf2400abd5a390f56d | |
| parent | pcmcia: sa11x0: convert memory allocation to devm_* API (diff) | |
| download | linux-ac92f1517379299c03dc501b6a44be49cfcbcfe4.tar.xz linux-ac92f1517379299c03dc501b6a44be49cfcbcfe4.zip | |
pcmcia: pxa2xx: update socket driver to use devm_clk_get() API
Update the pxa2xx socket driver to use the devm_clk_get() API so that
the cleanup paths are simplified.
Reviewed-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 984a8ff559d8..197c77a64ce0 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -296,17 +296,15 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) goto err0; } - clk = clk_get(&dev->dev, NULL); + clk = devm_clk_get(&dev->dev, NULL); if (IS_ERR(clk)) return -ENODEV; pxa2xx_drv_pcmcia_ops(ops); sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL); - if (!sinfo) { - clk_put(clk); + if (!sinfo) return -ENOMEM; - } sinfo->nskt = ops->nr; sinfo->clk = clk; @@ -332,7 +330,6 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) err1: while (--i >= 0) soc_pcmcia_remove_one(&sinfo->skt[i]); - clk_put(clk); kfree(sinfo); err0: return ret; @@ -348,7 +345,6 @@ static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev) for (i = 0; i < sinfo->nskt; i++) soc_pcmcia_remove_one(&sinfo->skt[i]); - clk_put(sinfo->clk); kfree(sinfo); return 0; } |