p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

watchdog: wm831x_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

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Guenter Roeck 2019-04-10 09:27:49 -07:00 committed by Wim Van Sebroeck
parent edaa35b557
commit 30f57e0f22
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/watchdog/wm831x_wdt.c
View File

@ -180,8 +180,9 @@ static const struct watchdog_ops wm831x_wdt_ops = {
static int wm831x_wdt_probe(struct platform_device *pdev) static int wm831x_wdt_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct device *dev = &pdev->dev;
struct wm831x_pdata *chip_pdata = dev_get_platdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(dev->parent);
struct wm831x_pdata *chip_pdata = dev_get_platdata(dev->parent);
struct wm831x_watchdog_pdata *pdata; struct wm831x_watchdog_pdata *pdata;
struct wm831x_wdt_drvdata *driver_data; struct wm831x_wdt_drvdata *driver_data;
struct watchdog_device *wm831x_wdt; struct watchdog_device *wm831x_wdt;
@ -198,8 +199,7 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
if (reg & WM831X_WDOG_DEBUG) if (reg & WM831X_WDOG_DEBUG)
dev_warn(wm831x->dev, "Watchdog is paused\n"); dev_warn(wm831x->dev, "Watchdog is paused\n");
driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data), driver_data = devm_kzalloc(dev, sizeof(*driver_data), GFP_KERNEL);
GFP_KERNEL);
if (!driver_data) if (!driver_data)
return -ENOMEM; return -ENOMEM;
@ -210,7 +210,7 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
wm831x_wdt->info = &wm831x_wdt_info; wm831x_wdt->info = &wm831x_wdt_info;
wm831x_wdt->ops = &wm831x_wdt_ops; wm831x_wdt->ops = &wm831x_wdt_ops;
wm831x_wdt->parent = &pdev->dev; wm831x_wdt->parent = dev;
watchdog_set_nowayout(wm831x_wdt, nowayout); watchdog_set_nowayout(wm831x_wdt, nowayout);
watchdog_set_drvdata(wm831x_wdt, driver_data); watchdog_set_drvdata(wm831x_wdt, driver_data);
@ -240,10 +240,9 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
reg |= pdata->software << WM831X_WDOG_RST_SRC_SHIFT; reg |= pdata->software << WM831X_WDOG_RST_SRC_SHIFT;
if (pdata->update_gpio) { if (pdata->update_gpio) {
ret = devm_gpio_request_one(&pdev->dev, ret = devm_gpio_request_one(dev, pdata->update_gpio,
pdata->update_gpio, GPIOF_OUT_INIT_LOW,
GPIOF_OUT_INIT_LOW, "Watchdog update");
"Watchdog update");
if (ret < 0) { if (ret < 0) {
dev_err(wm831x->dev, dev_err(wm831x->dev,
"Failed to request update GPIO: %d\n", "Failed to request update GPIO: %d\n",
@ -268,7 +267,7 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
} }
} }
ret = devm_watchdog_register_device(&pdev->dev, &driver_data->wdt); ret = devm_watchdog_register_device(dev, &driver_data->wdt);
if (ret != 0) { if (ret != 0) {
dev_err(wm831x->dev, "watchdog_register_device() failed: %d\n", dev_err(wm831x->dev, "watchdog_register_device() failed: %d\n",
ret); ret);