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

watchdog: meson_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: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 1678f830

drivers/watchdog/meson_wdt.c

+8 −7
Original line number Diff line number Diff line
@@ -164,11 +164,12 @@ MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids); 


static int meson_wdt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct meson_wdt_dev *meson_wdt;

	const struct of_device_id *of_id;

	int err;



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

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

	if (!meson_wdt)

		return -ENOMEM;
@@ -176,14 +177,14 @@ static int meson_wdt_probe(struct platform_device *pdev) 
	if (IS_ERR(meson_wdt->wdt_base))

		return PTR_ERR(meson_wdt->wdt_base);



	of_id = of_match_device(meson_wdt_dt_ids, &pdev->dev);

	of_id = of_match_device(meson_wdt_dt_ids, dev);

	if (!of_id) {

		dev_err(&pdev->dev, "Unable to initialize WDT data\n");

		dev_err(dev, "Unable to initialize WDT data\n");

		return -ENODEV;

	}

	meson_wdt->data = of_id->data;



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

	meson_wdt->wdt_dev.parent = dev;

	meson_wdt->wdt_dev.info = &meson_wdt_info;

	meson_wdt->wdt_dev.ops = &meson_wdt_ops;

	meson_wdt->wdt_dev.max_timeout =
@@ -195,18 +196,18 @@ static int meson_wdt_probe(struct platform_device *pdev) 


	watchdog_set_drvdata(&meson_wdt->wdt_dev, meson_wdt);



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

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

	watchdog_set_nowayout(&meson_wdt->wdt_dev, nowayout);

	watchdog_set_restart_priority(&meson_wdt->wdt_dev, 128);



	meson_wdt_stop(&meson_wdt->wdt_dev);



	watchdog_stop_on_reboot(&meson_wdt->wdt_dev);

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

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

	if (err)

		return err;



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

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

		 meson_wdt->wdt_dev.timeout, nowayout);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE