[PATCH] i2c: Drop i2c_driver.{owner,name}, 3 of 11

We should use the i2c_driver.driver's .name and .owner fields
instead of the i2c_driver's ones.

This patch updates the hwmon drivers.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 6f696f897176..db75fbccfb62 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -572,8 +572,10 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 /* The driver. I choose to use type i2c_driver, as at is identical to both
    smbus_driver and isa_driver, and clients could be of either kind */
 static struct i2c_driver via686a_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "via686a",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "via686a",
+        },
         .attach_adapter = via686a_detect,
         .detach_client  = via686a_detach_client,
 };
@@ -615,7 +617,8 @@ static int via686a_detect(struct i2c_adapter *adapter)
         }
 
         /* Reserve the ISA region */
-        if (!request_region(address, VIA686A_EXTENT, via686a_driver.name)) {
+        if (!request_region(address, VIA686A_EXTENT,
+                            via686a_driver.driver.name)) {
                 dev_err(&adapter->dev, "region 0x%x already in use!\n",
                         address);
                 return -ENODEV;