diff options
author | Guenter Roeck <linux@roeck-us.net> | 2016-01-03 18:11:58 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2016-01-11 15:53:59 -0500 |
commit | 0254e953537c92df3e7d0176f401a211e944fd61 (patch) | |
tree | eee8c9b7645c2add9f49c71d39b0e31950ac7efb /include/linux/watchdog.h | |
parent | 2c2f3080de7341f58a5d0e8ea31cc66dd369b8f4 (diff) |
watchdog: Drop pointer to watchdog device from struct watchdog_device
The lifetime of the watchdog device pointer is different from the lifetime
of its character device. Remove it entirely to avoid race conditions.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'include/linux/watchdog.h')
-rw-r--r-- | include/linux/watchdog.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index 076df50ea0da..b585fa2507ee 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h | |||
@@ -53,7 +53,6 @@ struct watchdog_ops { | |||
53 | /** struct watchdog_device - The structure that defines a watchdog device | 53 | /** struct watchdog_device - The structure that defines a watchdog device |
54 | * | 54 | * |
55 | * @id: The watchdog's ID. (Allocated by watchdog_register_device) | 55 | * @id: The watchdog's ID. (Allocated by watchdog_register_device) |
56 | * @dev: The device for our watchdog | ||
57 | * @parent: The parent bus device | 56 | * @parent: The parent bus device |
58 | * @groups: List of sysfs attribute groups to create when creating the | 57 | * @groups: List of sysfs attribute groups to create when creating the |
59 | * watchdog device. | 58 | * watchdog device. |
@@ -82,7 +81,6 @@ struct watchdog_ops { | |||
82 | */ | 81 | */ |
83 | struct watchdog_device { | 82 | struct watchdog_device { |
84 | int id; | 83 | int id; |
85 | struct device *dev; | ||
86 | struct device *parent; | 84 | struct device *parent; |
87 | const struct attribute_group **groups; | 85 | const struct attribute_group **groups; |
88 | const struct watchdog_info *info; | 86 | const struct watchdog_info *info; |