watchdog: Add support for creating driver specific sysfs attributes

The Zodiac watchdog driver attaches additional sysfs attributes to the
watchdog device. This has a number of problems: The watchdog device
lifetime differs from the driver lifetime, and the device structure
should therefore not be accessed from drivers. Also, creating sysfs
attributes after driver registration results in a potential race condition
if user space expects the attributes to exist but they don't exist yet.

Add support for creating driver specific sysfs attributes to the watchdog
core to solve the problems.

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>

diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt
index 72a009478b15e2886045032ed0544ba2f298fe31..312f60009c3e022f95e18a1b918b0d298d08fb15 100644 (file)
--- a/Documentation/watchdog/watchdog-kernel-api.txt
+++ b/Documentation/watchdog/watchdog-kernel-api.txt
@@ -46,6 +46,7 @@ struct watchdog_device {
        int id;
        struct device *dev;
        struct device *parent;
+       const struct attribute_group **groups;
        const struct watchdog_info *info;
        const struct watchdog_ops *ops;
        unsigned int bootstatus;
@@ -68,6 +69,8 @@ It contains following fields:
 * dev: device under the watchdog class (created by watchdog_register_device).
 * parent: set this to the parent device (or NULL) before calling
   watchdog_register_device.
+* groups: List of sysfs attribute groups to create when creating the watchdog
+  device.
 * info: a pointer to a watchdog_info structure. This structure gives some
   additional information about the watchdog timer itself. (Like it's unique name)
 * ops: a pointer to the list of watchdog operations that the watchdog supports.

diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 3cab6f6e7f1c6a8b11e2dc2798eeebf87c28a042..e89ccb2e9603b7d8a19ff855d6ad96c902506cf5 100644 (file)
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -744,8 +744,9 @@ int watchdog_dev_register(struct watchdog_device *wdd)
        if (ret)
                return ret;
 
-       dev = device_create(&watchdog_class, wdd->parent, devno, wdd,
-                           "watchdog%d", wdd->id);
+       dev = device_create_with_groups(&watchdog_class, wdd->parent,
+                                       devno, wdd, wdd->groups,
+                                       "watchdog%d", wdd->id);
        if (IS_ERR(dev)) {
                watchdog_cdev_unregister(wdd);
                return PTR_ERR(dev);

diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index aaabd4703b4630387b428b057facd41ab7cc2907..076df50ea0da158dce79d4e4463d4fd5cafcb418 100644 (file)
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -55,6 +55,8 @@ struct watchdog_ops {
  * @id:                The watchdog's ID. (Allocated by watchdog_register_device)
  * @dev:       The device for our watchdog
  * @parent:    The parent bus device
+ * @groups:    List of sysfs attribute groups to create when creating the
+ *             watchdog device.
  * @info:      Pointer to a watchdog_info structure.
  * @ops:       Pointer to the list of watchdog operations.
  * @bootstatus:        Status of the watchdog device at boot.
@@ -82,6 +84,7 @@ struct watchdog_device {
        int id;
        struct device *dev;
        struct device *parent;
+       const struct attribute_group **groups;
        const struct watchdog_info *info;
        const struct watchdog_ops *ops;
        unsigned int bootstatus;