diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-02-11 07:41:54 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2014-03-31 07:24:14 -0400 |
commit | 4f6120b014c6a981a57a8951e01acfead1a57069 (patch) | |
tree | 87f85a6d6ab757c0b0ecaaee723b0762cf30210d /drivers/watchdog/ep93xx_wdt.c | |
parent | a17fb5cbee5dffcb93aeb4b71e2ef9e0eeec0bc2 (diff) |
watchdog: ep93xx_wdt: Use devm_ioremap_resource()
Use devm_ioremap_resource() in order to make the code simpler,
and remove redundant return value check of platform_get_resource()
because the value is checked by devm_ioremap_resource().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/ep93xx_wdt.c')
-rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index d1d07f2f69df..5e4f3dea85f5 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c | |||
@@ -118,16 +118,9 @@ static int ep93xx_wdt_probe(struct platform_device *pdev) | |||
118 | int err; | 118 | int err; |
119 | 119 | ||
120 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 120 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
121 | if (!res) | 121 | mmio_base = devm_ioremap_resource(&pdev->dev, res); |
122 | return -ENXIO; | 122 | if (IS_ERR(mmio_base)) |
123 | 123 | return PTR_ERR(mmio_base); | |
124 | if (!devm_request_mem_region(&pdev->dev, res->start, | ||
125 | resource_size(res), pdev->name)) | ||
126 | return -EBUSY; | ||
127 | |||
128 | mmio_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); | ||
129 | if (!mmio_base) | ||
130 | return -ENXIO; | ||
131 | 124 | ||
132 | if (timeout < 1 || timeout > 3600) { | 125 | if (timeout < 1 || timeout > 3600) { |
133 | timeout = WDT_TIMEOUT; | 126 | timeout = WDT_TIMEOUT; |