4 files changed, 61 insertions, 316 deletions

diff --git a/drivers/hwmon/sch5627.c b/drivers/hwmon/sch5627.c
index 8ec6dfbccb64..8342275378b8 100644
--- a/drivers/hwmon/sch5627.c
+++ b/drivers/hwmon/sch5627.c
@@ -579,7 +579,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
         }
 
         /* Note failing to register the watchdog is not a fatal error */
-        data->watchdog = sch56xx_watchdog_register(data->addr,
+        data->watchdog = sch56xx_watchdog_register(&pdev->dev, data->addr,
                         (build_code << 24) | (build_id << 8) | hwmon_rev,
                         &data->update_lock, 1);
 
diff --git a/drivers/hwmon/sch5636.c b/drivers/hwmon/sch5636.c
index 906d4ed32d81..96a7e68718ca 100644
--- a/drivers/hwmon/sch5636.c
+++ b/drivers/hwmon/sch5636.c
@@ -510,7 +510,7 @@ static int __devinit sch5636_probe(struct platform_device *pdev)
         }
 
         /* Note failing to register the watchdog is not a fatal error */
-        data->watchdog = sch56xx_watchdog_register(data->addr,
+        data->watchdog = sch56xx_watchdog_register(&pdev->dev, data->addr,
                                         (revision[0] << 8) | revision[1],
                                         &data->update_lock, 0);
 
diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
index ce52fc57d41d..419a8e8f5191 100644
--- a/drivers/hwmon/sch56xx-common.c
+++ b/drivers/hwmon/sch56xx-common.c
@@ -66,15 +66,9 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
 
 struct sch56xx_watchdog_data {
         u16 addr;
-        u32 revision;
         struct mutex *io_lock;
-        struct mutex watchdog_lock;
-        struct list_head list; /* member of the watchdog_data_list */
-        struct kref kref;
-        struct miscdevice watchdog_miscdev;
-        unsigned long watchdog_is_open;
-        char watchdog_name[10]; /* must be unique to avoid sysfs conflict */
-        char watchdog_expect_close;
+        struct watchdog_info wdinfo;
+        struct watchdog_device wddev;
         u8 watchdog_preset;
         u8 watchdog_control;
         u8 watchdog_output_enable;
@@ -82,15 +76,6 @@ struct sch56xx_watchdog_data {
 
 static struct platform_device *sch56xx_pdev;
 
-/*
- * Somewhat ugly :( global data pointer list with all sch56xx devices, so that
- * we can find our device data as when using misc_register there is no other
- * method to get to ones device data from the open fop.
- */
-static LIST_HEAD(watchdog_data_list);
-/* Note this lock not only protect list access, but also data.kref access */
-static DEFINE_MUTEX(watchdog_data_mutex);
-
 /* Super I/O functions */
 static inline int superio_inb(int base, int reg)
 {
@@ -272,22 +257,13 @@ EXPORT_SYMBOL(sch56xx_read_virtual_reg12);
  * Watchdog routines
  */
 
-/*
- * Release our data struct when the platform device has been released *and*
- * all references to our watchdog device are released.
- */
-static void sch56xx_watchdog_release_resources(struct kref *r)
-{
-        struct sch56xx_watchdog_data *data =
-                container_of(r, struct sch56xx_watchdog_data, kref);
-        kfree(data);
-}
-
-static int watchdog_set_timeout(struct sch56xx_watchdog_data *data,
-                                int timeout)
+static int watchdog_set_timeout(struct watchdog_device *wddev,
+                                unsigned int timeout)
 {
-        int ret, resolution;
+        struct sch56xx_watchdog_data *data = watchdog_get_drvdata(wddev);
+        unsigned int resolution;
         u8 control;
+        int ret;
 
         /* 1 second or 60 second resolution? */
         if (timeout <= 255)
@@ -298,12 +274,6 @@ static int watchdog_set_timeout(struct sch56xx_watchdog_data *data,
         if (timeout < resolution || timeout > (resolution * 255))
                 return -EINVAL;
 
-        mutex_lock(&data->watchdog_lock);
-        if (!data->addr) {
-                ret = -ENODEV;
-                goto leave;
-        }
-
         if (resolution == 1)
                 control = data->watchdog_control | SCH56XX_WDOG_TIME_BASE_SEC;
         else
@@ -316,7 +286,7 @@ static int watchdog_set_timeout(struct sch56xx_watchdog_data *data,
                                                 control);
                 mutex_unlock(data->io_lock);
                 if (ret)
-                        goto leave;
+                        return ret;
 
                 data->watchdog_control = control;
         }
@@ -326,38 +296,17 @@ static int watchdog_set_timeout(struct sch56xx_watchdog_data *data,
          * the watchdog countdown.
          */
         data->watchdog_preset = DIV_ROUND_UP(timeout, resolution);
+        wddev->timeout = data->watchdog_preset * resolution;
 
-        ret = data->watchdog_preset * resolution;
-leave:
-        mutex_unlock(&data->watchdog_lock);
-        return ret;
-}
-
-static int watchdog_get_timeout(struct sch56xx_watchdog_data *data)
-{
-        int timeout;
-
-        mutex_lock(&data->watchdog_lock);
-        if (data->watchdog_control & SCH56XX_WDOG_TIME_BASE_SEC)
-                timeout = data->watchdog_preset;
-        else
-                timeout = data->watchdog_preset * 60;
-        mutex_unlock(&data->watchdog_lock);
-
-        return timeout;
+        return 0;
 }
 
-static int watchdog_start(struct sch56xx_watchdog_data *data)
+static int watchdog_start(struct watchdog_device *wddev)
 {
+        struct sch56xx_watchdog_data *data = watchdog_get_drvdata(wddev);
         int ret;
         u8 val;
 
-        mutex_lock(&data->watchdog_lock);
-        if (!data->addr) {
-                ret = -ENODEV;
-                goto leave_unlock_watchdog;
-        }
-
         /*
          * The sch56xx's watchdog cannot really be started / stopped
          * it is always running, but we can avoid the timer expiring
@@ -405,39 +354,29 @@ static int watchdog_start(struct sch56xx_watchdog_data *data)
 
 leave:
         mutex_unlock(data->io_lock);
-leave_unlock_watchdog:
-        mutex_unlock(&data->watchdog_lock);
         return ret;
 }
 
-static int watchdog_trigger(struct sch56xx_watchdog_data *data)
+static int watchdog_trigger(struct watchdog_device *wddev)
 {
+        struct sch56xx_watchdog_data *data = watchdog_get_drvdata(wddev);
         int ret;