aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGaël PORTAY <gael.portay@gmail.com>2014-09-06 13:52:34 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-09-08 04:54:03 -0400
commit8495497f921e73d5192d4896d55414f0304d8561 (patch)
tree68b187aa3d83df7adf130d8c2be643661715a7e2 /drivers
parent2626063f86cdce500153e8550334b9331421dc6f (diff)
ARM: at91/tclib: prefer using of devm_* functions
Signed-off-by: Gaël PORTAY <gael.portay@gmail.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/atmel_tclib.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c
index c8d8e38d0d8a..b514a2d4485b 100644
--- a/drivers/misc/atmel_tclib.c
+++ b/drivers/misc/atmel_tclib.c
@@ -150,17 +150,15 @@ static int __init tc_probe(struct platform_device *pdev)
150 if (irq < 0) 150 if (irq < 0)
151 return -EINVAL; 151 return -EINVAL;
152 152
153 tc = kzalloc(sizeof(struct atmel_tc), GFP_KERNEL); 153 tc = devm_kzalloc(&pdev->dev, sizeof(struct atmel_tc), GFP_KERNEL);
154 if (!tc) 154 if (!tc)
155 return -ENOMEM; 155 return -ENOMEM;
156 156
157 tc->pdev = pdev; 157 tc->pdev = pdev;
158 158
159 clk = clk_get(&pdev->dev, "t0_clk"); 159 clk = devm_clk_get(&pdev->dev, "t0_clk");
160 if (IS_ERR(clk)) { 160 if (IS_ERR(clk))
161 kfree(tc); 161 return PTR_ERR(clk);
162 return -EINVAL;
163 }
164 162
165 /* Now take SoC information if available */ 163 /* Now take SoC information if available */
166 if (pdev->dev.of_node) { 164 if (pdev->dev.of_node) {
@@ -171,10 +169,10 @@ static int __init tc_probe(struct platform_device *pdev)
171 } 169 }
172 170
173 tc->clk[0] = clk; 171 tc->clk[0] = clk;
174 tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); 172 tc->clk[1] = devm_clk_get(&pdev->dev, "t1_clk");
175 if (IS_ERR(tc->clk[1])) 173 if (IS_ERR(tc->clk[1]))
176 tc->clk[1] = clk; 174 tc->clk[1] = clk;
177 tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); 175 tc->clk[2] = devm_clk_get(&pdev->dev, "t2_clk");
178 if (IS_ERR(tc->clk[2])) 176 if (IS_ERR(tc->clk[2]))
179 tc->clk[2] = clk; 177 tc->clk[2] = clk;
180 178