]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
watchdog: armada_37xx_wdt: remove struct resource
authorRosen Penev <rosenp@gmail.com>
Thu, 3 Oct 2024 21:45:08 +0000 (14:45 -0700)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 4 Nov 2024 12:13:03 +0000 (13:13 +0100)
No need for it with devm_platform_ioremap_resource. Simplifies probe
slightly.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Marek BehĂșn <kabel@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241003214508.121107-1-rosenp@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/armada_37xx_wdt.c

index 8133a5d05647c2aff136c854eed5a78447b00c26..a17a7911771ace2d4c36a8e3b2a616c433562191 100644 (file)
@@ -248,7 +248,6 @@ static const struct watchdog_ops armada_37xx_wdt_ops = {
 static int armada_37xx_wdt_probe(struct platform_device *pdev)
 {
        struct armada_37xx_watchdog *dev;
-       struct resource *res;
        struct regmap *regmap;
        int ret;
 
@@ -266,12 +265,9 @@ static int armada_37xx_wdt_probe(struct platform_device *pdev)
                return PTR_ERR(regmap);
        dev->cpu_misc = regmap;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -ENODEV;
-       dev->reg = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-       if (!dev->reg)
-               return -ENOMEM;
+       dev->reg = devm_platform_ioremap_resource(pdev, 0);
+       if (IS_ERR(dev->reg))
+               return PTR_ERR(dev->reg);
 
        /* init clock */
        dev->clk = devm_clk_get_enabled(&pdev->dev, NULL);