[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, 10 insertions, 5 deletions

diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index d5f0d92378c5..24d520bcc0b6 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -234,16 +234,20 @@ static void it87_init_client(struct i2c_client *client, struct it87_data *data);
 
 
 static struct i2c_driver it87_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "it87",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "it87",
+        },
         .id             = I2C_DRIVERID_IT87,
         .attach_adapter = it87_attach_adapter,
         .detach_client  = it87_detach_client,
 };
 
 static struct i2c_driver it87_isa_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "it87-isa",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "it87-isa",
+        },
         .attach_adapter = it87_isa_attach_adapter,
         .detach_client  = it87_detach_client,
 };
@@ -760,7 +764,8 @@ static int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Reserve the ISA region */
         if (is_isa)
-                if (!request_region(address, IT87_EXTENT, it87_isa_driver.name))
+                if (!request_region(address, IT87_EXTENT,
+                                    it87_isa_driver.driver.name))
                         goto ERROR0;
 
         /* For now, we presume we have a valid client. We create the