Commit 6e8a7c75 authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

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

Introduce local variable 'struct device *dev' and use it instead of
dereferencing it repeatedly. Also replace 'ret = func(); return ret;'
with 'return func();'.

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: Support Opensource <support.opensource@diasemi.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarSteve Twiss <stwiss.opensource@diasemi.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 862c13b5

drivers/watchdog/da9062_wdt.c

+8 −12
Original line number Diff line number Diff line
@@ -46,14 +46,9 @@ static unsigned int da9062_wdt_timeout_to_sel(unsigned int secs) 


static int da9062_reset_watchdog_timer(struct da9062_watchdog *wdt)

{

	int ret;



	ret = regmap_update_bits(wdt->hw->regmap,

			   DA9062AA_CONTROL_F,

	return regmap_update_bits(wdt->hw->regmap, DA9062AA_CONTROL_F,

				  DA9062AA_WATCHDOG_MASK,

				  DA9062AA_WATCHDOG_MASK);



	return ret;

}



static int da9062_wdt_update_timeout_register(struct da9062_watchdog *wdt,
@@ -190,15 +185,16 @@ MODULE_DEVICE_TABLE(of, da9062_compatible_id_table); 


static int da9062_wdt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	int ret;

	struct da9062 *chip;

	struct da9062_watchdog *wdt;



	chip = dev_get_drvdata(pdev->dev.parent);

	chip = dev_get_drvdata(dev->parent);

	if (!chip)

		return -EINVAL;



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

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

	if (!wdt)

		return -ENOMEM;
@@ -211,13 +207,13 @@ static int da9062_wdt_probe(struct platform_device *pdev) 
	wdt->wdtdev.min_hw_heartbeat_ms = DA9062_RESET_PROTECTION_MS;

	wdt->wdtdev.timeout = DA9062_WDG_DEFAULT_TIMEOUT;

	wdt->wdtdev.status = WATCHDOG_NOWAYOUT_INIT_STATUS;

	wdt->wdtdev.parent = &pdev->dev;

	wdt->wdtdev.parent = dev;



	watchdog_set_restart_priority(&wdt->wdtdev, 128);



	watchdog_set_drvdata(&wdt->wdtdev, wdt);



	ret = devm_watchdog_register_device(&pdev->dev, &wdt->wdtdev);

	ret = devm_watchdog_register_device(dev, &wdt->wdtdev);

	if (ret < 0) {

		dev_err(wdt->hw->dev,

			"watchdog registration failed (%d)\n", ret);