[PATCH] i2c: Drop i2c_driver.{owner,name}, 4 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 drivers for macintosh.

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

4 files changed, 16 insertions, 8 deletions

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index f62c16fab42b..8bb1d857e14d 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -171,8 +171,10 @@ detach_thermostat(struct i2c_adapter *adapter)
 }
 
 static struct i2c_driver thermostat_driver = {  
-        .owner          = THIS_MODULE,
-        .name           = "therm_adt746x",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "therm_adt746x",
+        },
         .attach_adapter = attach_thermostat,
         .detach_adapter = detach_thermostat,
 };
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index df00c960fc5a..97807be6422b 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -283,8 +283,10 @@ static int therm_pm72_detach(struct i2c_adapter *adapter);
 
 static struct i2c_driver therm_pm72_driver =
 {
-        .owner          = THIS_MODULE,
-        .name           = "therm_pm72",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "therm_pm72",
+        },
         .attach_adapter = therm_pm72_attach,
         .detach_adapter = therm_pm72_detach,
 };
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index f3bae0d00ed2..259f19d5816c 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -354,8 +354,10 @@ do_detach( struct i2c_client *client )
 }
 
 static struct i2c_driver g4fan_driver = {  
-        .owner          = THIS_MODULE,
-        .name           = "therm_windtunnel",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "therm_windtunnel",
+        },
         .id             = I2C_DRIVERID_G4FAN,
         .attach_adapter = do_attach,
         .detach_client  = do_detach,
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 2392789ccf32..555d0e4eda1d 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -47,8 +47,10 @@ static int wf_lm75_attach(struct i2c_adapter *adapter);
 static int wf_lm75_detach(struct i2c_client *client);
 
 static struct i2c_driver wf_lm75_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "wf_lm75",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "wf_lm75",
+        },
         .attach_adapter = wf_lm75_attach,
         .detach_client  = wf_lm75_detach,
 };