Skip to content

Commit 06ba0b8

Browse files
nehebWim Van Sebroeck
authored andcommitted
watchdog: armada_37xx_wdt: remove struct resource
No need for it with devm_platform_ioremap_resource. Simplifies probe slightly. Signed-off-by: Rosen Penev <[email protected]> Reviewed-by: Marek Behún <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
1 parent e6a0898 commit 06ba0b8

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

drivers/watchdog/armada_37xx_wdt.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ static const struct watchdog_ops armada_37xx_wdt_ops = {
248248
static int armada_37xx_wdt_probe(struct platform_device *pdev)
249249
{
250250
struct armada_37xx_watchdog *dev;
251-
struct resource *res;
252251
struct regmap *regmap;
253252
int ret;
254253

@@ -266,12 +265,9 @@ static int armada_37xx_wdt_probe(struct platform_device *pdev)
266265
return PTR_ERR(regmap);
267266
dev->cpu_misc = regmap;
268267

269-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
270-
if (!res)
271-
return -ENODEV;
272-
dev->reg = devm_ioremap(&pdev->dev, res->start, resource_size(res));
273-
if (!dev->reg)
274-
return -ENOMEM;
268+
dev->reg = devm_platform_ioremap_resource(pdev, 0);
269+
if (IS_ERR(dev->reg))
270+
return PTR_ERR(dev->reg);
275271

276272
/* init clock */
277273
dev->clk = devm_clk_get_enabled(&pdev->dev, NULL);

0 commit comments

Comments
 (0)