@@ -974,6 +974,15 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
974
974
if (IS_ERR_OR_NULL (watchdog_kworker ))
975
975
return - ENODEV ;
976
976
977
+ device_initialize (& wd_data -> dev );
978
+ wd_data -> dev .devt = MKDEV (MAJOR (watchdog_devt ), wdd -> id );
979
+ wd_data -> dev .class = & watchdog_class ;
980
+ wd_data -> dev .parent = wdd -> parent ;
981
+ wd_data -> dev .groups = wdd -> groups ;
982
+ wd_data -> dev .release = watchdog_core_data_release ;
983
+ dev_set_drvdata (& wd_data -> dev , wdd );
984
+ dev_set_name (& wd_data -> dev , "watchdog%d" , wdd -> id );
985
+
977
986
kthread_init_work (& wd_data -> work , watchdog_ping_work );
978
987
hrtimer_init (& wd_data -> timer , CLOCK_MONOTONIC , HRTIMER_MODE_REL_HARD );
979
988
wd_data -> timer .function = watchdog_timer_expired ;
@@ -994,15 +1003,6 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
994
1003
}
995
1004
}
996
1005
997
- device_initialize (& wd_data -> dev );
998
- wd_data -> dev .devt = MKDEV (MAJOR (watchdog_devt ), wdd -> id );
999
- wd_data -> dev .class = & watchdog_class ;
1000
- wd_data -> dev .parent = wdd -> parent ;
1001
- wd_data -> dev .groups = wdd -> groups ;
1002
- wd_data -> dev .release = watchdog_core_data_release ;
1003
- dev_set_drvdata (& wd_data -> dev , wdd );
1004
- dev_set_name (& wd_data -> dev , "watchdog%d" , wdd -> id );
1005
-
1006
1006
/* Fill in the data structures */
1007
1007
cdev_init (& wd_data -> cdev , & watchdog_fops );
1008
1008
0 commit comments