Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 937192a7cf9f09e3ea02ef723855674f97e826bc

Authored by Wolfram Sang
1 parent ac066a5c1c
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

drivers/watchdog: don't check resource with devm_ioremap_resource 

devm_ioremap_resource does sanity checks on the given resource. No need to
duplicate this in the driver.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Showing 3 changed files with 0 additions and 15 deletions Side-by-side Diff

drivers/watchdog/ath79_wdt.c
Diff comments   View file @ 937192a
... ... @@ -248,11 +248,6 @@
248 248 return -EBUSY;
249 249  
250 250 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
251   - if (!res) {
252   - dev_err(&pdev->dev, "no memory resource found\n");
253   - return -EINVAL;
254   - }
255   -
256 251 wdt_base = devm_ioremap_resource(&pdev->dev, res);
257 252 if (IS_ERR(wdt_base))
258 253 return PTR_ERR(wdt_base);
drivers/watchdog/davinci_wdt.c
Diff comments   View file @ 937192a
... ... @@ -217,11 +217,6 @@
217 217 dev_info(dev, "heartbeat %d sec\n", heartbeat);
218 218  
219 219 wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
220   - if (wdt_mem == NULL) {
221   - dev_err(dev, "failed to get memory region resource\n");
222   - return -ENOENT;
223   - }
224   -
225 220 wdt_base = devm_ioremap_resource(dev, wdt_mem);
226 221 if (IS_ERR(wdt_base))
227 222 return PTR_ERR(wdt_base);
drivers/watchdog/imx2_wdt.c
Diff comments   View file @ 937192a
... ... @@ -257,11 +257,6 @@
257 257 struct resource *res;
258 258  
259 259 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
260   - if (!res) {
261   - dev_err(&pdev->dev, "can't get device resources\n");
262   - return -ENODEV;
263   - }
264   -
265 260 imx2_wdt.base = devm_ioremap_resource(&pdev->dev, res);
266 261 if (IS_ERR(imx2_wdt.base))
267 262 return PTR_ERR(imx2_wdt.base);