diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-08-14 05:11:25 -0400 |
---|---|---|
committer | Thierry Reding <thierry.reding@gmail.com> | 2013-09-03 07:09:16 -0400 |
commit | 88d5a2e6ffaa32e2a09a994872ca10aca07a36e9 (patch) | |
tree | 05783d570a357d15464bc346b4f8458990cc73b6 | |
parent | 382457e562bbb1ea7d94923e58fcbac9e981ff18 (diff) |
pwm: 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>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-rw-r--r-- | drivers/pwm/pwm-lpc32xx.c | 3 | ||||
-rw-r--r-- | drivers/pwm/pwm-renesas-tpu.c | 5 | ||||
-rw-r--r-- | drivers/pwm/pwm-spear.c | 7 |
3 files changed, 1 insertions, 14 deletions
diff --git a/drivers/pwm/pwm-lpc32xx.c b/drivers/pwm/pwm-lpc32xx.c index efb6c7bf8750..efac99e03d57 100644 --- a/drivers/pwm/pwm-lpc32xx.c +++ b/drivers/pwm/pwm-lpc32xx.c | |||
@@ -124,9 +124,6 @@ static int lpc32xx_pwm_probe(struct platform_device *pdev) | |||
124 | return -ENOMEM; | 124 | return -ENOMEM; |
125 | 125 | ||
126 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 126 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
127 | if (!res) | ||
128 | return -EINVAL; | ||
129 | |||
130 | lpc32xx->base = devm_ioremap_resource(&pdev->dev, res); | 127 | lpc32xx->base = devm_ioremap_resource(&pdev->dev, res); |
131 | if (IS_ERR(lpc32xx->base)) | 128 | if (IS_ERR(lpc32xx->base)) |
132 | return PTR_ERR(lpc32xx->base); | 129 | return PTR_ERR(lpc32xx->base); |
diff --git a/drivers/pwm/pwm-renesas-tpu.c b/drivers/pwm/pwm-renesas-tpu.c index 3eeffff69280..aff6ba9b49e7 100644 --- a/drivers/pwm/pwm-renesas-tpu.c +++ b/drivers/pwm/pwm-renesas-tpu.c | |||
@@ -418,11 +418,6 @@ static int tpu_probe(struct platform_device *pdev) | |||
418 | 418 | ||
419 | /* Map memory, get clock and pin control. */ | 419 | /* Map memory, get clock and pin control. */ |
420 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 420 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
421 | if (!res) { | ||
422 | dev_err(&pdev->dev, "failed to get I/O memory\n"); | ||
423 | return -ENXIO; | ||
424 | } | ||
425 | |||
426 | tpu->base = devm_ioremap_resource(&pdev->dev, res); | 421 | tpu->base = devm_ioremap_resource(&pdev->dev, res); |
427 | if (IS_ERR(tpu->base)) | 422 | if (IS_ERR(tpu->base)) |
428 | return PTR_ERR(tpu->base); | 423 | return PTR_ERR(tpu->base); |
diff --git a/drivers/pwm/pwm-spear.c b/drivers/pwm/pwm-spear.c index a54d21401431..8ad26b8bf418 100644 --- a/drivers/pwm/pwm-spear.c +++ b/drivers/pwm/pwm-spear.c | |||
@@ -178,18 +178,13 @@ static int spear_pwm_probe(struct platform_device *pdev) | |||
178 | int ret; | 178 | int ret; |
179 | u32 val; | 179 | u32 val; |
180 | 180 | ||
181 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
182 | if (!r) { | ||
183 | dev_err(&pdev->dev, "no memory resources defined\n"); | ||
184 | return -ENODEV; | ||
185 | } | ||
186 | |||
187 | pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); | 181 | pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); |
188 | if (!pc) { | 182 | if (!pc) { |
189 | dev_err(&pdev->dev, "failed to allocate memory\n"); | 183 | dev_err(&pdev->dev, "failed to allocate memory\n"); |
190 | return -ENOMEM; | 184 | return -ENOMEM; |
191 | } | 185 | } |
192 | 186 | ||
187 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
193 | pc->mmio_base = devm_ioremap_resource(&pdev->dev, r); | 188 | pc->mmio_base = devm_ioremap_resource(&pdev->dev, r); |
194 | if (IS_ERR(pc->mmio_base)) | 189 | if (IS_ERR(pc->mmio_base)) |
195 | return PTR_ERR(pc->mmio_base); | 190 | return PTR_ERR(pc->mmio_base); |