write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/watchdog/da9052_wdt.c
..
..
@@ -150,13 +150,13 @@
150
150
 
151
151
 static int da9052_wdt_probe(struct platform_device *pdev)
152
152
 {
153
-	struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent);
153
+	struct device *dev = &pdev->dev;
154
+	struct da9052 *da9052 = dev_get_drvdata(dev->parent);
154
155
 	struct da9052_wdt_data *driver_data;
155
156
 	struct watchdog_device *da9052_wdt;
156
157
 	int ret;
157
158
 
158
-	driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
159
-				   GFP_KERNEL);
159
+	driver_data = devm_kzalloc(dev, sizeof(*driver_data), GFP_KERNEL);
160
160
 	if (!driver_data)
161
161
 		return -ENOMEM;
162
162
 	driver_data->da9052 = da9052;
..
..
@@ -166,25 +166,17 @@
166
166
 	da9052_wdt->timeout = DA9052_DEF_TIMEOUT;
167
167
 	da9052_wdt->info = &da9052_wdt_info;
168
168
 	da9052_wdt->ops = &da9052_wdt_ops;
169
-	da9052_wdt->parent = &pdev->dev;
169
+	da9052_wdt->parent = dev;
170
170
 	watchdog_set_drvdata(da9052_wdt, driver_data);
171
171
 
172
172
 	ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG,
173
173
 				DA9052_CONTROLD_TWDSCALE, 0);
174
174
 	if (ret < 0) {
175
-		dev_err(&pdev->dev, "Failed to disable watchdog bits, %d\n",
176
-			ret);
175
+		dev_err(dev, "Failed to disable watchdog bits, %d\n", ret);
177
176
 		return ret;
178
177
 	}
179
178
 
180
-	ret = devm_watchdog_register_device(&pdev->dev, &driver_data->wdt);
181
-	if (ret != 0) {
182
-		dev_err(da9052->dev, "watchdog_register_device() failed: %d\n",
183
-			ret);
184
-		return ret;
185
-	}
186
-
187
-	return ret;
179
+	return devm_watchdog_register_device(dev, &driver_data->wdt);
188
180
 }
189
181
 
190
182
 static struct platform_driver da9052_wdt_driver = {