diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2013-05-12 09:19:54 -0400 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2013-05-18 05:58:04 -0400 |
| commit | 937192a7cf9f09e3ea02ef723855674f97e826bc (patch) | |
| tree | 0af05d16978a8e1ed5ce8abf8f4648d90cdb2a40 | |
| parent | ac066a5c1c012e2a1375ff105b98b3b22fc9e7d2 (diff) | |
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>
| -rw-r--r-- | drivers/watchdog/ath79_wdt.c | 5 | ||||
| -rw-r--r-- | drivers/watchdog/davinci_wdt.c | 5 | ||||
| -rw-r--r-- | drivers/watchdog/imx2_wdt.c | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c index d184c48a0482..37cb09b27b63 100644 --- a/drivers/watchdog/ath79_wdt.c +++ b/drivers/watchdog/ath79_wdt.c | |||
| @@ -248,11 +248,6 @@ static int ath79_wdt_probe(struct platform_device *pdev) | |||
| 248 | return -EBUSY; | 248 | return -EBUSY; |
| 249 | 249 | ||
| 250 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 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 | wdt_base = devm_ioremap_resource(&pdev->dev, res); | 251 | wdt_base = devm_ioremap_resource(&pdev->dev, res); |
| 257 | if (IS_ERR(wdt_base)) | 252 | if (IS_ERR(wdt_base)) |
| 258 | return PTR_ERR(wdt_base); | 253 | return PTR_ERR(wdt_base); |
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 100d4fbfde2a..bead7740c86a 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c | |||
| @@ -217,11 +217,6 @@ static int davinci_wdt_probe(struct platform_device *pdev) | |||
| 217 | dev_info(dev, "heartbeat %d sec\n", heartbeat); | 217 | dev_info(dev, "heartbeat %d sec\n", heartbeat); |
| 218 | 218 | ||
| 219 | wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 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 | wdt_base = devm_ioremap_resource(dev, wdt_mem); | 220 | wdt_base = devm_ioremap_resource(dev, wdt_mem); |
| 226 | if (IS_ERR(wdt_base)) | 221 | if (IS_ERR(wdt_base)) |
| 227 | return PTR_ERR(wdt_base); | 222 | return PTR_ERR(wdt_base); |
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index ff908823688c..62946c2cb4f8 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c | |||
| @@ -257,11 +257,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) | |||
| 257 | struct resource *res; | 257 | struct resource *res; |
| 258 | 258 | ||
| 259 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 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 | imx2_wdt.base = devm_ioremap_resource(&pdev->dev, res); | 260 | imx2_wdt.base = devm_ioremap_resource(&pdev->dev, res); |
| 266 | if (IS_ERR(imx2_wdt.base)) | 261 | if (IS_ERR(imx2_wdt.base)) |
| 267 | return PTR_ERR(imx2_wdt.base); | 262 | return PTR_ERR(imx2_wdt.base); |
