Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f0a6a28 authored Apr 02, 2019 by Guenter Roeck Committed by Wim Van Sebroeck May 05, 2019

watchdog: Convert to use devm_platform_ioremap_resource



Use devm_platform_ioremap_resource to reduce source code size,
improve readability, and reduce the likelyhood of bugs.

The conversion was done automatically with coccinelle using the
following semantic patch.

@r@
identifier res, pdev;
expression a;
expression index;
expression e;
@@

<+...
- res = platform_get_resource(pdev, IORESOURCE_MEM, index);
- a = devm_ioremap_resource(e, res);
+ a = devm_platform_ioremap_resource(pdev, index);
...+>

@depends on r@
identifier r.res;
@@
- struct resource *res;
  ... when != res

@@
identifier res, pdev;
expression index;
expression a;
@@
- struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, index);
- a = devm_ioremap_resource(&pdev->dev, res);
+ a = devm_platform_ioremap_resource(pdev, index);

Cc: Joel Stanley <joel@jms.id.au>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Keguang Zhang <keguang.zhang@gmail.com>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Avi Fishman <avifishman70@gmail.com>
Cc: Nancy Yuen <yuenn@google.com>
Cc: Brendan Higgins <brendanhiggins@google.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Barry Song <baohua@kernel.org>
Cc: Orson Zhai <orsonzhai@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Marc Gonzalez <marc.w.gonzalez@free.fr>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Tested-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Michal Simek <michal.simek@xilinx.com> (cadence/xilinx wdts)
Acked-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

parent 24b82256

drivers/watchdog/asm9260_wdt.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -276,7 +276,6 @@ static int asm9260_wdt_probe(struct platform_device *pdev)
		{
		struct asm9260_wdt_priv *priv;
		struct watchdog_device *wdd;
		struct resource *res;
		int ret;
		static const char * const mode_name[] = { "hw", "sw", "debug", };

		@@ -287,8 +286,7 @@ static int asm9260_wdt_probe(struct platform_device *pdev)

		priv->dev = &pdev->dev;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		priv->iobase = devm_ioremap_resource(&pdev->dev, res);
		priv->iobase = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(priv->iobase))
		return PTR_ERR(priv->iobase);

drivers/watchdog/aspeed_wdt.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -190,7 +190,6 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
		const struct aspeed_wdt_config *config;
		const struct of_device_id *ofdid;
		struct aspeed_wdt *wdt;
		struct resource *res;
		struct device_node *np;
		const char *reset_type;
		u32 duration;
		@@ -201,8 +200,7 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
		if (!wdt)
		return -ENOMEM;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		wdt->base = devm_ioremap_resource(&pdev->dev, res);
		wdt->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(wdt->base))
		return PTR_ERR(wdt->base);

drivers/watchdog/at91sam9_wdt.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -327,7 +327,6 @@ static inline int of_at91wdt_init(struct device_node np, struct at91wdt wdt)

		static int __init at91wdt_probe(struct platform_device *pdev)
		{
		struct resource *r;
		int err;
		struct at91wdt *wdt;

		@@ -346,8 +345,7 @@ static int __init at91wdt_probe(struct platform_device *pdev)
		wdt->wdd.min_timeout = 1;
		wdt->wdd.max_timeout = 0xFFFF;

		r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		wdt->base = devm_ioremap_resource(&pdev->dev, r);
		wdt->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(wdt->base))
		return PTR_ERR(wdt->base);

drivers/watchdog/ath79_wdt.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -250,15 +250,13 @@ static struct miscdevice ath79_wdt_miscdev = {

		static int ath79_wdt_probe(struct platform_device *pdev)
		{
		struct resource *res;
		u32 ctrl;
		int err;

		if (wdt_base)
		return -EBUSY;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		wdt_base = devm_ioremap_resource(&pdev->dev, res);
		wdt_base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(wdt_base))
		return PTR_ERR(wdt_base);

drivers/watchdog/atlas7_wdt.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -129,15 +129,13 @@ static int atlas7_wdt_probe(struct platform_device *pdev)
		{
		struct device_node *np = pdev->dev.of_node;
		struct atlas7_wdog *wdt;
		struct resource *res;
		struct clk *clk;
		int ret;

		wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
		if (!wdt)
		return -ENOMEM;
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		wdt->base = devm_ioremap_resource(&pdev->dev, res);
		wdt->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(wdt->base))
		return PTR_ERR(wdt->base);