hwmon: Convert from class_device to device

Convert from class_device to device for hwmon_device_register/unregister

Signed-off-by: Tony Jones <tonyj@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index cdd8b6dea16d..cb2331bfd9d5 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -124,7 +124,7 @@ struct abituguru3_motherboard_info {
    The structure is dynamically allocated, at the same time when a new
    abituguru3 device is allocated. */
 struct abituguru3_data {
-        struct class_device *class_dev; /* hwmon registered device */
+        struct device *hwmon_dev;       /* hwmon registered device */
         struct mutex update_lock;       /* protect access to data and uGuru */
         unsigned short addr;            /* uguru base address */
         char valid;                     /* !=0 if following fields are valid */
@@ -933,9 +933,9 @@ static int __devinit abituguru3_probe(struct platform_device *pdev)
                                 &abituguru3_sysfs_attr[i].dev_attr))
                         goto abituguru3_probe_error;
 
-        data->class_dev = hwmon_device_register(&pdev->dev);
-        if (IS_ERR(data->class_dev)) {
-                res = PTR_ERR(data->class_dev);
+        data->hwmon_dev = hwmon_device_register(&pdev->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                res = PTR_ERR(data->hwmon_dev);
                 goto abituguru3_probe_error;
         }
 
@@ -957,7 +957,7 @@ static int __devexit abituguru3_remove(struct platform_device *pdev)
         struct abituguru3_data *data = platform_get_drvdata(pdev);
 
         platform_set_drvdata(pdev, NULL);
-        hwmon_device_unregister(data->class_dev);
+        hwmon_device_unregister(data->hwmon_dev);
         for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++)
                 device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr);
         for (i = 0; i < ARRAY_SIZE(abituguru3_sysfs_attr); i++)