Linux-Watchdog Archive on lore.kernel.org
 help / color / Atom feed
From: Michal Simek <michal.simek@xilinx.com>
To: Guenter Roeck <linux@roeck-us.net>,
	Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: <linux-watchdog@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Michal Simek <michal.simek@xilinx.com>
Subject: Re: [PATCH 10/23] watchdog: of_xilinx_wdt: Convert to use device managed functions and other improvements
Date: Wed, 10 Apr 2019 08:38:14 +0200
Message-ID: <85e92d6f-5521-af0a-f6e0-b3411b7cd8e9@xilinx.com> (raw)
In-Reply-To: <1554830641-9247-11-git-send-email-linux@roeck-us.net>

On 09. 04. 19 19:23, Guenter Roeck wrote:
> 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 empty remove function
> - Use devm_add_action_or_reset() for calls to clk_disable_unprepare
> - Introduce local variable 'struct device *dev' and use it instead of
>   dereferencing it repeatedly
> - Use devm_watchdog_register_driver() to register watchdog device
> 
> Cc: Michal Simek <michal.simek@xilinx.com>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
>  drivers/watchdog/of_xilinx_wdt.c | 58 ++++++++++++++++++----------------------
>  1 file changed, 26 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
> index 5c977164b3e5..03786992b701 100644
> --- a/drivers/watchdog/of_xilinx_wdt.c
> +++ b/drivers/watchdog/of_xilinx_wdt.c
> @@ -151,41 +151,46 @@ static u32 xwdt_selftest(struct xwdt_device *xdev)
>  		return XWT_TIMER_FAILED;
>  }
>  
> +static void xwdt_clk_disable_unprepare(void *data)
> +{
> +	clk_disable_unprepare(data);
> +}
> +
>  static int xwdt_probe(struct platform_device *pdev)
>  {
> +	struct device *dev = &pdev->dev;
>  	int rc;
>  	u32 pfreq = 0, enable_once = 0;
>  	struct xwdt_device *xdev;
>  	struct watchdog_device *xilinx_wdt_wdd;
>  
> -	xdev = devm_kzalloc(&pdev->dev, sizeof(*xdev), GFP_KERNEL);
> +	xdev = devm_kzalloc(dev, sizeof(*xdev), GFP_KERNEL);
>  	if (!xdev)
>  		return -ENOMEM;
>  
>  	xilinx_wdt_wdd = &xdev->xilinx_wdt_wdd;
>  	xilinx_wdt_wdd->info = &xilinx_wdt_ident;
>  	xilinx_wdt_wdd->ops = &xilinx_wdt_ops;
> -	xilinx_wdt_wdd->parent = &pdev->dev;
> +	xilinx_wdt_wdd->parent = dev;
>  
>  	xdev->base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(xdev->base))
>  		return PTR_ERR(xdev->base);
>  
> -	rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-interval",
> +	rc = of_property_read_u32(dev->of_node, "xlnx,wdt-interval",
>  				  &xdev->wdt_interval);
>  	if (rc)
> -		dev_warn(&pdev->dev,
> -			 "Parameter \"xlnx,wdt-interval\" not found\n");
> +		dev_warn(dev, "Parameter \"xlnx,wdt-interval\" not found\n");
>  
> -	rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-enable-once",
> +	rc = of_property_read_u32(dev->of_node, "xlnx,wdt-enable-once",
>  				  &enable_once);
>  	if (rc)
> -		dev_warn(&pdev->dev,
> +		dev_warn(dev,
>  			 "Parameter \"xlnx,wdt-enable-once\" not found\n");
>  
>  	watchdog_set_nowayout(xilinx_wdt_wdd, enable_once);
>  
> -	xdev->clk = devm_clk_get(&pdev->dev, NULL);
> +	xdev->clk = devm_clk_get(dev, NULL);
>  	if (IS_ERR(xdev->clk)) {
>  		if (PTR_ERR(xdev->clk) != -ENOENT)
>  			return PTR_ERR(xdev->clk);
> @@ -196,10 +201,10 @@ static int xwdt_probe(struct platform_device *pdev)
>  		 */
>  		xdev->clk = NULL;
>  
> -		rc = of_property_read_u32(pdev->dev.of_node, "clock-frequency",
> +		rc = of_property_read_u32(dev->of_node, "clock-frequency",
>  					  &pfreq);
>  		if (rc)
> -			dev_warn(&pdev->dev,
> +			dev_warn(dev,
>  				 "The watchdog clock freq cannot be obtained\n");
>  	} else {
>  		pfreq = clk_get_rate(xdev->clk);
> @@ -218,44 +223,34 @@ static int xwdt_probe(struct platform_device *pdev)
>  
>  	rc = clk_prepare_enable(xdev->clk);
>  	if (rc) {
> -		dev_err(&pdev->dev, "unable to enable clock\n");
> +		dev_err(dev, "unable to enable clock\n");
>  		return rc;
>  	}
> +	rc = devm_add_action_or_reset(dev, xwdt_clk_disable_unprepare,
> +				      xdev->clk);
> +	if (rc)
> +		return rc;
>  
>  	rc = xwdt_selftest(xdev);
>  	if (rc == XWT_TIMER_FAILED) {
> -		dev_err(&pdev->dev, "SelfTest routine error\n");
> -		goto err_clk_disable;
> +		dev_err(dev, "SelfTest routine error\n");
> +		return rc;
>  	}
>  
> -	rc = watchdog_register_device(xilinx_wdt_wdd);
> +	rc = devm_watchdog_register_device(dev, xilinx_wdt_wdd);
>  	if (rc) {
> -		dev_err(&pdev->dev, "Cannot register watchdog (err=%d)\n", rc);
> -		goto err_clk_disable;
> +		dev_err(dev, "Cannot register watchdog (err=%d)\n", rc);
> +		return rc;
>  	}
>  
>  	clk_disable(xdev->clk);
>  
> -	dev_info(&pdev->dev, "Xilinx Watchdog Timer at %p with timeout %ds\n",
> +	dev_info(dev, "Xilinx Watchdog Timer at %p with timeout %ds\n",
>  		 xdev->base, xilinx_wdt_wdd->timeout);
>  
>  	platform_set_drvdata(pdev, xdev);
>  
>  	return 0;
> -err_clk_disable:
> -	clk_disable_unprepare(xdev->clk);
> -
> -	return rc;
> -}
> -
> -static int xwdt_remove(struct platform_device *pdev)
> -{
> -	struct xwdt_device *xdev = platform_get_drvdata(pdev);
> -
> -	watchdog_unregister_device(&xdev->xilinx_wdt_wdd);
> -	clk_disable_unprepare(xdev->clk);
> -
> -	return 0;
>  }
>  
>  /**
> @@ -303,7 +298,6 @@ MODULE_DEVICE_TABLE(of, xwdt_of_match);
>  
>  static struct platform_driver xwdt_driver = {
>  	.probe       = xwdt_probe,
> -	.remove      = xwdt_remove,
>  	.driver = {
>  		.name  = WATCHDOG_NAME,
>  		.of_match_table = xwdt_of_match,
> 

Looks good to me. I would prefer to do it via 3 patches but I will let
Wim to comment.

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

  reply index

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-09 17:23 [PATCH 00/23] watchdog: Expand use of device managed functions (series 2 of 3) Guenter Roeck
2019-04-09 17:23 ` [PATCH 01/23] watchdog: max77620_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-09 17:23 ` [PATCH 02/23] watchdog: mena21_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-11  7:18   ` Johannes Thumshirn
2019-04-09 17:23 ` [PATCH 03/23] watchdog: menf21bmc_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-09 17:23 ` [PATCH 04/23] watchdog: meson_gxbb_wdt: " Guenter Roeck
2019-04-09 17:23 ` [PATCH 05/23] watchdog: meson_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-09 17:23 ` [PATCH 06/23] watchdog: mlx_wdt: " Guenter Roeck
2019-04-09 17:23 ` [PATCH 07/23] watchdog: moxart_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-09 17:23 ` [PATCH 08/23] watchdog: mtk_wdt: " Guenter Roeck
2019-04-09 17:23 ` [PATCH 09/23] watchdog: npcm_wdt: Use local variable 'dev' consistently Guenter Roeck
2019-04-09 17:23 ` [PATCH 10/23] watchdog: of_xilinx_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-10  6:38   ` Michal Simek [this message]
2019-04-10 12:09     ` Guenter Roeck
2019-04-09 17:23 ` [PATCH 11/23] watchdog: pm8916_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-09 17:23 ` [PATCH 12/23] watchdog: qcom-wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-09 17:23 ` [PATCH 13/23] watchdog: rn5t618_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-09 17:23 ` [PATCH 14/23] watchdog: rtd119x_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-09 17:23 ` [PATCH 15/23] watchdog: rza_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-09 17:23 ` [PATCH 16/23] watchdog: sama5d4_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-09 17:23 ` [PATCH 17/23] watchdog: sirfsoc_wdt: " Guenter Roeck
2019-04-09 17:23 ` [PATCH 18/23] watchdog: 1: " Guenter Roeck
2019-04-09 17:38   ` Guenter Roeck
2019-04-09 17:23 ` [PATCH 19/23] watchdog: st_lpc_wdt: Convert to use device managed functions Guenter Roeck
2019-04-10  7:26   ` Patrice CHOTARD
2019-04-09 17:23 ` [PATCH 20/23] watchdog: stmp3xxx_rtc_wdt: " Guenter Roeck
2019-04-09 17:23 ` [PATCH 21/23] watchdog: stpmic1_wdt: Use 'dev' instead of dereferencing it repeatedly Guenter Roeck
2019-04-09 17:24 ` [PATCH 22/23] watchdog: sunxi_wdt: " Guenter Roeck
2019-04-10  7:06   ` Maxime Ripard
2019-04-09 17:24 ` [PATCH 23/23] watchdog: tangox_wdt: Convert to use device managed functions and other improvements Guenter Roeck
2019-04-10 11:20   ` Måns Rullgård

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=85e92d6f-5521-af0a-f6e0-b3411b7cd8e9@xilinx.com \
    --to=michal.simek@xilinx.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --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