scsi: qla2xxx: remove double assignment in qla2x00_update_fcport

[linux-2.6-microblaze.git] / drivers / watchdog / da9052_wdt.c

diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index e263bad..a2feef1 100644 (file)
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -150,13 +150,13 @@ static const struct watchdog_ops da9052_wdt_ops = {
 
 static int da9052_wdt_probe(struct platform_device *pdev)
 {
-       struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent);
+       struct device *dev = &pdev->dev;
+       struct da9052 *da9052 = dev_get_drvdata(dev->parent);
        struct da9052_wdt_data *driver_data;
        struct watchdog_device *da9052_wdt;
        int ret;
 
-       driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
-                                  GFP_KERNEL);
+       driver_data = devm_kzalloc(dev, sizeof(*driver_data), GFP_KERNEL);
        if (!driver_data)
                return -ENOMEM;
        driver_data->da9052 = da9052;
@@ -166,18 +166,17 @@ static int da9052_wdt_probe(struct platform_device *pdev)
        da9052_wdt->timeout = DA9052_DEF_TIMEOUT;
        da9052_wdt->info = &da9052_wdt_info;
        da9052_wdt->ops = &da9052_wdt_ops;
-       da9052_wdt->parent = &pdev->dev;
+       da9052_wdt->parent = dev;
        watchdog_set_drvdata(da9052_wdt, driver_data);
 
        ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG,
                                DA9052_CONTROLD_TWDSCALE, 0);
        if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to disable watchdog bits, %d\n",
-                       ret);
+               dev_err(dev, "Failed to disable watchdog bits, %d\n", ret);
                return ret;
        }
 
-       ret = devm_watchdog_register_device(&pdev->dev, &driver_data->wdt);
+       ret = devm_watchdog_register_device(dev, &driver_data->wdt);
        if (ret != 0) {
                dev_err(da9052->dev, "watchdog_register_device() failed: %d\n",
                        ret);