Commit 8ba41f6c authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

watchdog: sunxi_wdt: Use 'dev' instead of dereferencing it repeatedly 

Introduce local variable 'struct device *dev' and use it instead of
dereferencing it repeatedly.

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



Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent d07c4ad8

drivers/watchdog/sunxi_wdt.c

+8 −7
Original line number Diff line number Diff line
@@ -233,14 +233,15 @@ MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids); 


static int sunxi_wdt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct sunxi_wdt_dev *sunxi_wdt;

	int err;



	sunxi_wdt = devm_kzalloc(&pdev->dev, sizeof(*sunxi_wdt), GFP_KERNEL);

	sunxi_wdt = devm_kzalloc(dev, sizeof(*sunxi_wdt), GFP_KERNEL);

	if (!sunxi_wdt)

		return -EINVAL;



	sunxi_wdt->wdt_regs = of_device_get_match_data(&pdev->dev);

	sunxi_wdt->wdt_regs = of_device_get_match_data(dev);

	if (!sunxi_wdt->wdt_regs)

		return -ENODEV;
@@ -253,9 +254,9 @@ static int sunxi_wdt_probe(struct platform_device *pdev) 
	sunxi_wdt->wdt_dev.timeout = WDT_MAX_TIMEOUT;

	sunxi_wdt->wdt_dev.max_timeout = WDT_MAX_TIMEOUT;

	sunxi_wdt->wdt_dev.min_timeout = WDT_MIN_TIMEOUT;

	sunxi_wdt->wdt_dev.parent = &pdev->dev;

	sunxi_wdt->wdt_dev.parent = dev;



	watchdog_init_timeout(&sunxi_wdt->wdt_dev, timeout, &pdev->dev);

	watchdog_init_timeout(&sunxi_wdt->wdt_dev, timeout, dev);

	watchdog_set_nowayout(&sunxi_wdt->wdt_dev, nowayout);

	watchdog_set_restart_priority(&sunxi_wdt->wdt_dev, 128);
@@ -264,11 +265,11 @@ static int sunxi_wdt_probe(struct platform_device *pdev) 
	sunxi_wdt_stop(&sunxi_wdt->wdt_dev);



	watchdog_stop_on_reboot(&sunxi_wdt->wdt_dev);

	err = devm_watchdog_register_device(&pdev->dev, &sunxi_wdt->wdt_dev);

	err = devm_watchdog_register_device(dev, &sunxi_wdt->wdt_dev);

	if (unlikely(err))

		return err;



	dev_info(&pdev->dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)",

	dev_info(dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)",

		 sunxi_wdt->wdt_dev.timeout, nowayout);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE