From 924e5ea2ce0f6addb8b098760d840b0923573d19 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 26 Mar 2015 10:27:08 +0000 Subject: [PATCH] pcmcia: sa1111: 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. Signed-off-by: Russell King --- drivers/pcmcia/sa1111_generic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 80b8e9d..fb902af 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -145,7 +145,7 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, return -ENOMEM; s->soc.nr = ops->first + i; - s->soc.clk = clk_get(&dev->dev, NULL); + s->soc.clk = devm_clk_get(&dev->dev, NULL); if (IS_ERR(s->soc.clk)) { ret = PTR_ERR(s->soc.clk); kfree(s); @@ -226,7 +226,6 @@ static int pcmcia_remove(struct sa1111_dev *dev) for (; s; s = next) { next = s->next; soc_pcmcia_remove_one(&s->soc); - clk_put(s->soc.clk); kfree(s); } -- 2.7.4