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

diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 18448f83a6b0..3af5b06995e0 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -164,16 +164,20 @@ static void lm78_init_client(struct i2c_client *client);
 
 
 static struct i2c_driver lm78_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "lm78",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "lm78",
+        },
         .id             = I2C_DRIVERID_LM78,
         .attach_adapter = lm78_attach_adapter,
         .detach_client  = lm78_detach_client,
 };
 
 static struct i2c_driver lm78_isa_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "lm78-isa",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "lm78-isa",
+        },
         .attach_adapter = lm78_isa_attach_adapter,
         .detach_client  = lm78_detach_client,
 };
@@ -496,7 +500,7 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Reserve the ISA region */
         if (is_isa)
                 if (!request_region(address, LM78_EXTENT,
-                                    lm78_isa_driver.name)) {
+                                    lm78_isa_driver.driver.name)) {
                         err = -EBUSY;
                         goto ERROR0;
                 }