Linux-Watchdog Archive on lore.kernel.org
 help / color / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
	Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 13/22] watchdog: davinci_wdt: Convert to use device managed functions and other improvements
Date: Mon,  8 Apr 2019 12:38:37 -0700
Message-ID: <1554752326-13319-14-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1554752326-13319-1-git-send-email-linux@roeck-us.net>

Use device managed functions to simplify error handling, reduce
source code size, improve readability, and reduce the likelyhood of bugs.
Other improvements as listed below.

The conversion was done automatically with coccinelle using the
following semantic patches. The semantic patches and the scripts
used to generate this commit log are available at
https://github.com/groeck/coccinelle-patches

- Drop assignments to otherwise unused variables
- Drop unnecessary braces around conditional return statements
- Drop empty remove function
- Use devm_add_action_or_reset() for calls to clk_disable_unprepare
- Use local variable 'struct device *dev' consistently
- Use devm_watchdog_register_driver() to register watchdog device

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/watchdog/davinci_wdt.c | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 7daa15df74a5..7b2ee35b5ffd 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -191,6 +191,11 @@ static const struct watchdog_ops davinci_wdt_ops = {
 	.restart	= davinci_wdt_restart,
 };
 
+static void davinci_clk_disable_unprepare(void *data)
+{
+	clk_disable_unprepare(data);
+}
+
 static int davinci_wdt_probe(struct platform_device *pdev)
 {
 	int ret = 0;
@@ -206,15 +211,19 @@ static int davinci_wdt_probe(struct platform_device *pdev)
 
 	if (IS_ERR(davinci_wdt->clk)) {
 		if (PTR_ERR(davinci_wdt->clk) != -EPROBE_DEFER)
-			dev_err(&pdev->dev, "failed to get clock node\n");
+			dev_err(dev, "failed to get clock node\n");
 		return PTR_ERR(davinci_wdt->clk);
 	}
 
 	ret = clk_prepare_enable(davinci_wdt->clk);
 	if (ret) {
-		dev_err(&pdev->dev, "failed to prepare clock\n");
+		dev_err(dev, "failed to prepare clock\n");
 		return ret;
 	}
+	ret = devm_add_action_or_reset(dev, davinci_clk_disable_unprepare,
+				       davinci_wdt->clk);
+	if (ret)
+		return ret;
 
 	platform_set_drvdata(pdev, davinci_wdt);
 
@@ -224,7 +233,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
 	wdd->min_timeout	= 1;
 	wdd->max_timeout	= MAX_HEARTBEAT;
 	wdd->timeout		= DEFAULT_HEARTBEAT;
-	wdd->parent		= &pdev->dev;
+	wdd->parent		= dev;
 
 	watchdog_init_timeout(wdd, heartbeat, dev);
 
@@ -235,33 +244,16 @@ static int davinci_wdt_probe(struct platform_device *pdev)
 	watchdog_set_restart_priority(wdd, 128);
 
 	davinci_wdt->base = devm_platform_ioremap_resource(pdev, 0);
-	if (IS_ERR(davinci_wdt->base)) {
-		ret = PTR_ERR(davinci_wdt->base);
-		goto err_clk_disable;
-	}
+	if (IS_ERR(davinci_wdt->base))
+		return PTR_ERR(davinci_wdt->base);
 
-	ret = watchdog_register_device(wdd);
+	ret = devm_watchdog_register_device(dev, wdd);
 	if (ret) {
 		dev_err(dev, "cannot register watchdog device\n");
-		goto err_clk_disable;
+		return ret;
 	}
 
 	return 0;
-
-err_clk_disable:
-	clk_disable_unprepare(davinci_wdt->clk);
-
-	return ret;
-}
-
-static int davinci_wdt_remove(struct platform_device *pdev)
-{
-	struct davinci_wdt_device *davinci_wdt = platform_get_drvdata(pdev);
-
-	watchdog_unregister_device(&davinci_wdt->wdd);
-	clk_disable_unprepare(davinci_wdt->clk);
-
-	return 0;
 }
 
 static const struct of_device_id davinci_wdt_of_match[] = {
@@ -276,7 +268,6 @@ static struct platform_driver platform_wdt_driver = {
 		.of_match_table = davinci_wdt_of_match,
 	},
 	.probe = davinci_wdt_probe,
-	.remove = davinci_wdt_remove,
 };
 
 module_platform_driver(platform_wdt_driver);
-- 
2.7.4


  parent reply index

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-08 19:38 [PATCH 00/22] watchdog: " Guenter Roeck
2019-04-08 19:38 ` [PATCH 01/22] watchdog: armada_37xx_wdt: " Guenter Roeck
2019-04-08 19:38 ` [PATCH 02/22] watchdog: asm9260_wdt: " Guenter Roeck
2019-04-08 19:38 ` [PATCH 03/22] watchdog: aspeed_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-09  0:37   ` Andrew Jeffery
2019-04-09  1:03     ` Guenter Roeck
2019-04-09  1:05       ` Andrew Jeffery
2019-04-08 19:38 ` [PATCH 04/22] watchdog: atlas7_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-08 19:38 ` [PATCH 05/22] watchdog: bcm2835_wdt: drop platform_set_drvdata Guenter Roeck
2019-04-09  6:54   ` Stefan Wahren
2019-04-08 19:38 ` [PATCH 06/22] watchdog: bcm7038_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-08 19:38 ` [PATCH 07/22] watchdog: bcm_kona_wdt: " Guenter Roeck
2019-04-09 16:36   ` Ray Jui
2019-04-08 19:38 ` [PATCH 08/22] watchdog: cadence_wdt: " Guenter Roeck
2019-04-08 19:38 ` [PATCH 09/22] watchdog: da9052_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-10 12:12   ` Steve Twiss
2019-04-08 19:38 ` [PATCH 10/22] watchdog: da9055_wdt: " Guenter Roeck
2019-04-10 12:14   ` Steve Twiss
2019-04-08 19:38 ` [PATCH 11/22] watchdog: da9062_wdt: " Guenter Roeck
2019-04-10 12:20   ` Steve Twiss
2019-04-08 19:38 ` [PATCH 12/22] watchdog: da9063_wdt: " Guenter Roeck
2019-04-10 12:50   ` Steve Twiss
2019-04-10 13:11     ` Guenter Roeck
2019-04-08 19:38 ` Guenter Roeck [this message]
2019-04-08 19:38 ` [PATCH 14/22] watchdog: ep93xx_wdt: " Guenter Roeck
2019-04-08 19:38 ` [PATCH 15/22] watchdog: ftwdt010_wdt: Use 'dev' consistently Guenter Roeck
2019-04-08 19:38 ` [PATCH 16/22] watchdog: gpio_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-08 19:38 ` [PATCH 17/22] watchdog: iTCO_wdt: Various improvements Guenter Roeck
2019-04-08 19:38 ` [PATCH 18/22] watchdog: imgpdc_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-08 19:38 ` [PATCH 19/22] watchdog: intel-mid_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-08 19:38 ` [PATCH 20/22] watchdog: kempld_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-08 19:38 ` [PATCH 21/22] watchdog: lpc18xx_wdt: " Guenter Roeck
2019-04-08 19:38 ` [PATCH 22/22] watchdog: max63xx_wdt: " Guenter Roeck

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1554752326-13319-14-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=wim@linux-watchdog.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Watchdog Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-watchdog/0 linux-watchdog/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-watchdog linux-watchdog/ https://lore.kernel.org/linux-watchdog \
		linux-watchdog@vger.kernel.org
	public-inbox-index linux-watchdog

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-watchdog


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git