From: rmk+kernel@arm•linux.org.uk (Russell King)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 5/8] pcmcia: sa1111: update socket driver to use devm_clk_get() API
Date: Thu, 26 Mar 2015 11:23:52 +0000 [thread overview]
Message-ID: <E1Yb5tA-0006IC-R9@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20150326112254.GZ8656@n2100.arm.linux.org.uk>
Update the pxa2xx socket driver to use the devm_clk_get() API so that
the cleanup paths are simplified.
Signed-off-by: Russell King <rmk+kernel@arm•linux.org.uk>
---
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 80b8e9d05275..fb902af8a5b7 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);
}
--
1.8.3.1
next prev parent reply other threads:[~2015-03-26 11:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-26 11:22 [PATCH 0/8] sa11x0 PCMCIA updates Russell King - ARM Linux
2015-03-26 11:23 ` [PATCH 1/8] pcmcia: sa11x0: fix missing clk_put() in sa11x0 socket drivers Russell King
2015-03-26 11:23 ` [PATCH 2/8] pcmcia: sa11x0: convert memory allocation to devm_* API Russell King
2015-03-26 11:23 ` [PATCH 3/8] pcmcia: pxa2xx: update socket driver to use devm_clk_get() API Russell King
2015-03-26 11:23 ` [PATCH 4/8] pcmcia: pxa2xx: convert memory allocation to devm_* API Russell King
2015-03-28 21:38 ` Robert Jarzmik
2015-03-28 22:06 ` Russell King - ARM Linux
2015-03-26 11:23 ` Russell King [this message]
2015-03-26 11:23 ` [PATCH 6/8] pcmcia: sa1111: simplify clk handing in sa1111_pcmcia_add() Russell King
2015-03-26 11:24 ` [PATCH 7/8] pcmcia: sa11xx_base.c: remove useless init/exit functions Russell King
2015-03-26 11:24 ` [PATCH 8/8] pcmcia: soc_common: remove skt_dev_info's clk pointer Russell King
2015-03-26 20:38 ` [PATCH 0/8] sa11x0 PCMCIA updates Robert Jarzmik
-- strict thread matches above, loose matches on Subject: below --
2015-07-15 18:03 Russell King - ARM Linux
2015-07-15 18:04 ` [PATCH 5/8] pcmcia: sa1111: update socket driver to use devm_clk_get() API Russell King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1Yb5tA-0006IC-R9@rmk-PC.arm.linux.org.uk \
--to=rmk+kernel@arm$(echo .)linux.org.uk \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox