diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:28 -0400 |
---|---|---|
committer | Ohad Ben-Cohen <ohad@wizery.com> | 2014-02-24 04:10:24 -0500 |
commit | 0ddc5ec1c1f4d776a8e702b3bcc25daa015b8de6 (patch) | |
tree | 5a15154a5a685e96b277d6e99f61ae240b69124b /drivers/remoteproc/da8xx_remoteproc.c | |
parent | 5d658bfdb4ca797104f3ad9a88dae86bee0ac77a (diff) |
remoteproc/davinci: simplify use of devm_ioremap_resource
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
[simplify patch title]
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Diffstat (limited to 'drivers/remoteproc/da8xx_remoteproc.c')
-rw-r--r-- | drivers/remoteproc/da8xx_remoteproc.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index b91cd3086fb7..3841b9813109 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c | |||
@@ -201,23 +201,11 @@ static int da8xx_rproc_probe(struct platform_device *pdev) | |||
201 | } | 201 | } |
202 | 202 | ||
203 | bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 203 | bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
204 | if (!bootreg_res) { | ||
205 | dev_err(dev, | ||
206 | "platform_get_resource(IORESOURCE_MEM, 0): NULL\n"); | ||
207 | return -EADDRNOTAVAIL; | ||
208 | } | ||
209 | |||
210 | chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | ||
211 | if (!chipsig_res) { | ||
212 | dev_err(dev, | ||
213 | "platform_get_resource(IORESOURCE_MEM, 1): NULL\n"); | ||
214 | return -EADDRNOTAVAIL; | ||
215 | } | ||
216 | |||
217 | bootreg = devm_ioremap_resource(dev, bootreg_res); | 204 | bootreg = devm_ioremap_resource(dev, bootreg_res); |
218 | if (IS_ERR(bootreg)) | 205 | if (IS_ERR(bootreg)) |
219 | return PTR_ERR(bootreg); | 206 | return PTR_ERR(bootreg); |
220 | 207 | ||
208 | chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | ||
221 | chipsig = devm_ioremap_resource(dev, chipsig_res); | 209 | chipsig = devm_ioremap_resource(dev, chipsig_res); |
222 | if (IS_ERR(chipsig)) | 210 | if (IS_ERR(chipsig)) |
223 | return PTR_ERR(chipsig); | 211 | return PTR_ERR(chipsig); |