]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchdog: jz4740_wdt: Use 'dev' instead of dereferencing it repeatedly
authorGuenter Roeck <linux@roeck-us.net>
Wed, 10 Apr 2019 16:28:01 +0000 (09:28 -0700)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Sun, 5 May 2019 19:02:37 +0000 (21:02 +0200)
Introduce local variable 'struct device *dev' and use it instead of
dereferencing it repeatedly. Also, there is no call to dev_get_drvdata()
or platform_get_drvdata() in the driver, so drop the unnecessary
call to platform_set_drvdata().

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>
drivers/watchdog/jz4740_wdt.c

index aa9d3523addd6e79963e4aa516ee767a19c20165..d1bc7cbd4f2b1a53d73cb2dc4b5b0f36ea7ee64f 100644 (file)
@@ -163,11 +163,12 @@ MODULE_DEVICE_TABLE(of, jz4740_wdt_of_matches);
 
 static int jz4740_wdt_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        struct jz4740_wdt_drvdata *drvdata;
        struct watchdog_device *jz4740_wdt;
        int ret;
 
-       drvdata = devm_kzalloc(&pdev->dev, sizeof(struct jz4740_wdt_drvdata),
+       drvdata = devm_kzalloc(dev, sizeof(struct jz4740_wdt_drvdata),
                               GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
@@ -181,7 +182,7 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
        jz4740_wdt->timeout = heartbeat;
        jz4740_wdt->min_timeout = 1;
        jz4740_wdt->max_timeout = MAX_HEARTBEAT;
-       jz4740_wdt->parent = &pdev->dev;
+       jz4740_wdt->parent = dev;
        watchdog_set_nowayout(jz4740_wdt, nowayout);
        watchdog_set_drvdata(jz4740_wdt, drvdata);
 
@@ -189,18 +190,16 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
        if (IS_ERR(drvdata->base))
                return PTR_ERR(drvdata->base);
 
-       drvdata->rtc_clk = devm_clk_get(&pdev->dev, "rtc");
+       drvdata->rtc_clk = devm_clk_get(dev, "rtc");
        if (IS_ERR(drvdata->rtc_clk)) {
-               dev_err(&pdev->dev, "cannot find RTC clock\n");
+               dev_err(dev, "cannot find RTC clock\n");
                return PTR_ERR(drvdata->rtc_clk);
        }
 
-       ret = devm_watchdog_register_device(&pdev->dev, &drvdata->wdt);
+       ret = devm_watchdog_register_device(dev, &drvdata->wdt);
        if (ret < 0)
                return ret;
 
-       platform_set_drvdata(pdev, drvdata);
-
        return 0;
 }