OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
8e2caf0
)
pcmcia: sa1111: update socket driver to use devm_clk_get() API
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 26 Mar 2015 10:27:08 +0000
(10:27 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 3 Sep 2015 15:00:44 +0000
(16:00 +0100)
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
patch
|
blob
|
history
diff --git
a/drivers/pcmcia/sa1111_generic.c
b/drivers/pcmcia/sa1111_generic.c
index
80b8e9d
..
fb902af
100644
(file)
--- 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);
}