@@ -151,12 +151,11 @@ static const struct watchdog_ops rzg2l_wdt_ops = {
151
151
.restart = rzg2l_wdt_restart ,
152
152
};
153
153
154
- static void rzg2l_wdt_reset_assert_pm_disable_put (void * data )
154
+ static void rzg2l_wdt_reset_assert_pm_disable (void * data )
155
155
{
156
156
struct watchdog_device * wdev = data ;
157
157
struct rzg2l_wdt_priv * priv = watchdog_get_drvdata (wdev );
158
158
159
- pm_runtime_put (wdev -> parent );
160
159
pm_runtime_disable (wdev -> parent );
161
160
reset_control_assert (priv -> rstc );
162
161
}
@@ -206,11 +205,6 @@ static int rzg2l_wdt_probe(struct platform_device *pdev)
206
205
207
206
reset_control_deassert (priv -> rstc );
208
207
pm_runtime_enable (& pdev -> dev );
209
- ret = pm_runtime_resume_and_get (& pdev -> dev );
210
- if (ret < 0 ) {
211
- dev_err (dev , "pm_runtime_resume_and_get failed ret=%pe" , ERR_PTR (ret ));
212
- goto out_pm_get ;
213
- }
214
208
215
209
priv -> wdev .info = & rzg2l_wdt_ident ;
216
210
priv -> wdev .ops = & rzg2l_wdt_ops ;
@@ -222,7 +216,7 @@ static int rzg2l_wdt_probe(struct platform_device *pdev)
222
216
223
217
watchdog_set_drvdata (& priv -> wdev , priv );
224
218
ret = devm_add_action_or_reset (& pdev -> dev ,
225
- rzg2l_wdt_reset_assert_pm_disable_put ,
219
+ rzg2l_wdt_reset_assert_pm_disable ,
226
220
& priv -> wdev );
227
221
if (ret < 0 )
228
222
return ret ;
@@ -235,12 +229,6 @@ static int rzg2l_wdt_probe(struct platform_device *pdev)
235
229
dev_warn (dev , "Specified timeout invalid, using default" );
236
230
237
231
return devm_watchdog_register_device (& pdev -> dev , & priv -> wdev );
238
-
239
- out_pm_get :
240
- pm_runtime_disable (dev );
241
- reset_control_assert (priv -> rstc );
242
-
243
- return ret ;
244
232
}
245
233
246
234
static const struct of_device_id rzg2l_wdt_ids [] = {
0 commit comments