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

watchdog: pm8916_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-09 10:23:49 -07:00 committed by Wim Van Sebroeck
parent 801cdffe68
commit 9723a82a97
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/watchdog/pm8916_wdt.c
View File

@ -132,15 +132,16 @@ static const struct watchdog_ops pm8916_wdt_ops = {
static int pm8916_wdt_probe(struct platform_device *pdev) static int pm8916_wdt_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct pm8916_wdt *wdt; struct pm8916_wdt *wdt;
struct device *parent; struct device *parent;
int err, irq; int err, irq;
wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
if (!wdt) if (!wdt)
return -ENOMEM; return -ENOMEM;
parent = pdev->dev.parent; parent = dev->parent;
/* /*
* The pm8916-pon-wdt is a child of the pon device, which is a child * The pm8916-pon-wdt is a child of the pon device, which is a child
@ -150,20 +151,20 @@ static int pm8916_wdt_probe(struct platform_device *pdev)
*/ */
wdt->regmap = dev_get_regmap(parent->parent, NULL); wdt->regmap = dev_get_regmap(parent->parent, NULL);
if (!wdt->regmap) { if (!wdt->regmap) {
dev_err(&pdev->dev, "failed to locate regmap\n"); dev_err(dev, "failed to locate regmap\n");
return -ENODEV; return -ENODEV;
} }
err = device_property_read_u32(parent, "reg", &wdt->baseaddr); err = device_property_read_u32(parent, "reg", &wdt->baseaddr);
if (err) { if (err) {
dev_err(&pdev->dev, "failed to get pm8916-pon address\n"); dev_err(dev, "failed to get pm8916-pon address\n");
return err; return err;
} }
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq > 0) { if (irq > 0) {
if (devm_request_irq(&pdev->dev, irq, pm8916_wdt_isr, 0, if (devm_request_irq(dev, irq, pm8916_wdt_isr, 0, "pm8916_wdt",
"pm8916_wdt", wdt)) wdt))
irq = 0; irq = 0;
} }
@ -172,23 +173,23 @@ static int pm8916_wdt_probe(struct platform_device *pdev)
wdt->baseaddr + PON_PMIC_WD_RESET_S2_CTL, wdt->baseaddr + PON_PMIC_WD_RESET_S2_CTL,
RESET_TYPE_HARD); RESET_TYPE_HARD);
if (err) { if (err) {
dev_err(&pdev->dev, "failed configure watchdog\n"); dev_err(dev, "failed configure watchdog\n");
return err; return err;
} }
wdt->wdev.info = (irq > 0) ? &pm8916_wdt_pt_ident : &pm8916_wdt_ident, wdt->wdev.info = (irq > 0) ? &pm8916_wdt_pt_ident : &pm8916_wdt_ident,
wdt->wdev.ops = &pm8916_wdt_ops, wdt->wdev.ops = &pm8916_wdt_ops,
wdt->wdev.parent = &pdev->dev; wdt->wdev.parent = dev;
wdt->wdev.min_timeout = PM8916_WDT_MIN_TIMEOUT; wdt->wdev.min_timeout = PM8916_WDT_MIN_TIMEOUT;
wdt->wdev.max_timeout = PM8916_WDT_MAX_TIMEOUT; wdt->wdev.max_timeout = PM8916_WDT_MAX_TIMEOUT;
wdt->wdev.timeout = PM8916_WDT_DEFAULT_TIMEOUT; wdt->wdev.timeout = PM8916_WDT_DEFAULT_TIMEOUT;
wdt->wdev.pretimeout = 0; wdt->wdev.pretimeout = 0;
watchdog_set_drvdata(&wdt->wdev, wdt); watchdog_set_drvdata(&wdt->wdev, wdt);
watchdog_init_timeout(&wdt->wdev, 0, &pdev->dev); watchdog_init_timeout(&wdt->wdev, 0, dev);
pm8916_wdt_configure_timers(&wdt->wdev); pm8916_wdt_configure_timers(&wdt->wdev);
return devm_watchdog_register_device(&pdev->dev, &wdt->wdev); return devm_watchdog_register_device(dev, &wdt->wdev);
} }
static const struct of_device_id pm8916_wdt_id_table[] = { static const struct of_device_id pm8916_wdt_id_table[] = {