[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>

diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 5e6df4b7b8570e83bdfa06bfa37795fbed7a1bbf..679cb92ccaf4b7dae5f62c9565c00dd9d19c01b4 100644 (file)
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -126,8 +126,10 @@ static int read_only;
 
 /* This is the driver that will be inserted */
 static struct i2c_driver adm1021_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "adm1021",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "adm1021",
+       },
        .id             = I2C_DRIVERID_ADM1021,
        .attach_adapter = adm1021_attach_adapter,
        .detach_client  = adm1021_detach_client,

diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index 2be48a7a90b85aabc73b4a74260c5e83f0aed8a7..3c70622c8cb1bef7f05c831d64f0d3106338b517 100644 (file)
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -118,8 +118,10 @@ static struct adm1025_data *adm1025_update_device(struct device *dev);
  */
 
 static struct i2c_driver adm1025_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "adm1025",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "adm1025",
+       },
        .id             = I2C_DRIVERID_ADM1025,
        .attach_adapter = adm1025_attach_adapter,
        .detach_client  = adm1025_detach_client,

diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 5416db809f9707e9d51e20520eb28244f760744c..92fac344d05b3867ac1ffb8ab5415dedc051cf65 100644 (file)
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -308,8 +308,10 @@ static void adm1026_init_client(struct i2c_client *client);
 
 
 static struct i2c_driver adm1026_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "adm1026",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "adm1026",
+       },
        .attach_adapter = adm1026_attach_adapter,
        .detach_client  = adm1026_detach_client,
 };

diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 1e24428090c4bb49f7d4800ab940988f57be1010..e42d75e28804f50ed613e84e25683dc19ee4c9d6 100644 (file)
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -105,8 +105,10 @@ static struct adm1031_data *adm1031_update_device(struct device *dev);
 
 /* This is the driver that will be inserted */
 static struct i2c_driver adm1031_driver = {
-       .owner = THIS_MODULE,
-       .name = "adm1031",
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "adm1031",
+       },
        .attach_adapter = adm1031_attach_adapter,
        .detach_client = adm1031_detach_client,
 };

diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 287733fe2c0da6abdd4e1a63f950100a3d266e15..e60309e9726c63cc4956c8765df44ae81561207e 100644 (file)
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -137,8 +137,10 @@ static struct adm9240_data *adm9240_update_device(struct device *dev);
 
 /* driver data */
 static struct i2c_driver adm9240_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "adm9240",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "adm9240",
+       },
        .id             = I2C_DRIVERID_ADM9240,
        .attach_adapter = adm9240_attach_adapter,
        .detach_client  = adm9240_detach_client,

diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 7227f800bef9580d16f02d6add8eb13a792691e0..3068de0dc7285165f6bc51fe0154d16dc7cc1b36 100644 (file)
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -217,8 +217,10 @@ static struct asb100_data *asb100_update_device(struct device *dev);
 static void asb100_init_client(struct i2c_client *client);
 
 static struct i2c_driver asb100_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "asb100",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "asb100",
+       },
        .id             = I2C_DRIVERID_ASB100,
        .attach_adapter = asb100_attach_adapter,
        .detach_client  = asb100_detach_client,

diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index a60a9f20281b6557c9c5cb7d7937168cd68073ff..ed152d93964336fea67d92993122716636c80d5a 100644 (file)
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -50,8 +50,10 @@ static struct atxp1_data * atxp1_update_device(struct device *dev);
 static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind);
 
 static struct i2c_driver atxp1_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "atxp1",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "atxp1",
+       },
        .attach_adapter = atxp1_attach_adapter,
        .detach_client  = atxp1_detach_client,
 };

diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 0096eb37c663e05b25b01ff31da79c18e525f292..860094005c14b0874757d6fdee3a56f1428ce3aa 100644 (file)
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -89,8 +89,10 @@ static struct ds1621_data *ds1621_update_client(struct device *dev);
 
 /* This is the driver that will be inserted */
 static struct i2c_driver ds1621_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "ds1621",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "ds1621",
+       },
        .id             = I2C_DRIVERID_DS1621,
        .attach_adapter = ds1621_attach_adapter,
        .detach_client  = ds1621_detach_client,

diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index f56ca06dbf8811cd5aa891a4ce7fbaf0f1b7c2cd..982fff42ce94b5f57f93b31c131b6e6601c664d4 100644 (file)
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -118,8 +118,10 @@ static int fscher_write_value(struct i2c_client *client, u8 reg, u8 value);
  */
  
 static struct i2c_driver fscher_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "fscher",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "fscher",
+       },
        .id             = I2C_DRIVERID_FSCHER,
        .attach_adapter = fscher_attach_adapter,
        .detach_client  = fscher_detach_client,

diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 701dffc2ceed20c611ad39cbbb8216bdfefbb3a9..971146b92cc0adc2d7e9a2f4e09ed9cf1699e940 100644 (file)
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -100,8 +100,10 @@ static void reset_fan_alarm(struct i2c_client *client, int nr);
  * Driver data (common to all clients)
  */
 static struct i2c_driver fscpos_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "fscpos",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "fscpos",
+       },
        .id             = I2C_DRIVERID_FSCPOS,
        .attach_adapter = fscpos_attach_adapter,
        .detach_client  = fscpos_detach_client,

diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 5788bbb77d8d5934b3a3c958a4d564aaba6ddefa..9c5ca1f467a9804a08c8b736bed2a50536ad8ace 100644 (file)
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -151,8 +151,10 @@ static struct gl518_data *gl518_update_device(struct device *dev);
 
 /* This is the driver that will be inserted */
 static struct i2c_driver gl518_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "gl518sm",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "gl518sm",
+       },
        .id             = I2C_DRIVERID_GL518,
        .attach_adapter = gl518_attach_adapter,
        .detach_client  = gl518_detach_client,

diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index b3998165193d62289fc8baf33690704bb517aaef..a9a724a6f38ae3e4577d956e4d61a3ad4b64c945 100644 (file)
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -109,8 +109,10 @@ static struct gl520_data *gl520_update_device(struct device *dev);
 
 /* Driver data */
 static struct i2c_driver gl520_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "gl520sm",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "gl520sm",
+       },
        .id             = I2C_DRIVERID_GL520,
        .attach_adapter = gl520_attach_adapter,
        .detach_client  = gl520_detach_client,

diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index d5f0d92378c5899aaf827a5139f91d2fdd2dffdb..24d520bcc0b69fbc5f0fdabdb9ac979d9de6d96b 100644 (file)
--- 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

diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index c2dd4ac8042d9aca55269f7d088c9669d0a9ea1c..35baae742cff69b78d31a5e257305579ba850504 100644 (file)
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -139,8 +139,10 @@ static void lm63_init_client(struct i2c_client *client);
  */
 
 static struct i2c_driver lm63_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm63",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm63",
+       },
        .attach_adapter = lm63_attach_adapter,
        .detach_client  = lm63_detach_client,
 };

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 0bcbd65151394594da346aca362caa58e0462777..db35fbf4d2504d13c9130aefef146b0fb5b5c1f8 100644 (file)
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -66,8 +66,10 @@ static struct lm75_data *lm75_update_device(struct device *dev);
 
 /* This is the driver that will be inserted */
 static struct i2c_driver lm75_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm75",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm75",
+       },
        .id             = I2C_DRIVERID_LM75,
        .attach_adapter = lm75_attach_adapter,
        .detach_client  = lm75_detach_client,

diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index 6a524e92432e214e5ee40ebfc15d7f6ce9d2bfe2..177072056d7da03b7df8fa3aef4b2ad60818ff0d 100644 (file)
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -74,8 +74,10 @@ static struct lm77_data *lm77_update_device(struct device *dev);
 
 /* This is the driver that will be inserted */
 static struct i2c_driver lm77_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm77",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm77",
+       },
        .attach_adapter = lm77_attach_adapter,
        .detach_client  = lm77_detach_client,
 };

diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 18448f83a6b0099671727159b7a2d953b0bb3543..3af5b06995e01b5dcb3f5d6b16e060bb4580208d 100644 (file)
--- 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;
                }

diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 02303fa0c4647ddd1e37779b9696cc2ef3ae58ec..1dc118f411a7981c7480d4eacdbd59a54ccdcf98 100644 (file)
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -143,8 +143,10 @@ static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value);
  */
 
 static struct i2c_driver lm80_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm80",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm80",
+       },
        .id             = I2C_DRIVERID_LM80,
        .attach_adapter = lm80_attach_adapter,
        .detach_client  = lm80_detach_client,

diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 96cb34ea2490a17bbaee9b5a3d3012877d8e1502..1c1744f699fbb986bc7f5b34a829c275c64522ef 100644 (file)
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -124,8 +124,10 @@ static struct lm83_data *lm83_update_device(struct device *dev);
  */
  
 static struct i2c_driver lm83_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm83",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm83",
+       },
        .id             = I2C_DRIVERID_LM83,
        .attach_adapter = lm83_attach_adapter,
        .detach_client  = lm83_detach_client,

diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 131ecab094acdc519bc299341dfb77181862fb11..b537c18c7a12bd579d75e5647be6d9c74aef1d10 100644 (file)
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -380,8 +380,10 @@ static void lm85_init_client(struct i2c_client *client);
 
 
 static struct i2c_driver lm85_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm85",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm85",
+       },
        .id             = I2C_DRIVERID_LM85,
        .attach_adapter = lm85_attach_adapter,
        .detach_client  = lm85_detach_client,

diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 26fd0b33beafa21f01093d647f68aa30b2003a1b..3152c006ce06aeed74635d9cf852d6b647d41c98 100644 (file)
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -161,8 +161,10 @@ static struct lm87_data *lm87_update_device(struct device *dev);
  */
 
 static struct i2c_driver lm87_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm87",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm87",
+       },
        .id             = I2C_DRIVERID_LM87,
        .attach_adapter = lm87_attach_adapter,
        .detach_client  = lm87_detach_client,

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 011923b7091d870da8c96f8a5c7e1f0a28a22e86..ff7ba1e1bcc7a916a40599095ceed43d459af544 100644 (file)
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -186,8 +186,10 @@ static struct lm90_data *lm90_update_device(struct device *dev);
  */
 
 static struct i2c_driver lm90_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm90",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm90",
+       },
        .id             = I2C_DRIVERID_LM90,
        .attach_adapter = lm90_attach_adapter,
        .detach_client  = lm90_detach_client,

diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 2005a9ee61fb488ebc8f536a05cdb8db84fa5eb1..b4e4a8409d014ee5daf767915cb61e9cbc585c14 100644 (file)
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -410,8 +410,10 @@ static int lm92_detach_client(struct i2c_client *client)
  */
 
 static struct i2c_driver lm92_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "lm92",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "lm92",
+       },
        .id             = I2C_DRIVERID_LM92,
        .attach_adapter = lm92_attach_adapter,
        .detach_client  = lm92_detach_client,

diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index d5aebef126d53e5035a045584189a7e2357521cc..1a50b13a62ae4a48ace668751bbcc1ff1036546f 100644 (file)
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -90,8 +90,10 @@ static struct max1619_data *max1619_update_device(struct device *dev);
  */
 
 static struct i2c_driver max1619_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "max1619",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "max1619",
+       },
        .attach_adapter = max1619_attach_adapter,
        .detach_client  = max1619_detach_client,
 };

diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 17f745a23d049898ba55dc51dc7499d64fcee606..5469489c758a16931361b944d312a77122d1b294 100644 (file)
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -236,8 +236,10 @@ static struct pc87360_data *pc87360_update_device(struct device *dev);
  */
 
 static struct i2c_driver pc87360_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "pc87360",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "pc87360",
+       },
        .attach_adapter = pc87360_detect,
        .detach_client  = pc87360_detach_client,
 };
@@ -798,7 +800,7 @@ static int pc87360_detect(struct i2c_adapter *adapter)
        for (i = 0; i < 3; i++) {
                if (((data->address[i] = extra_isa[i]))
                 && !request_region(extra_isa[i], PC87360_EXTENT,
-                                   pc87360_driver.name)) {
+                                   pc87360_driver.driver.name)) {
                        dev_err(&new_client->dev, "Region 0x%x-0x%x already "
                                "in use!\n", extra_isa[i],
                                extra_isa[i]+PC87360_EXTENT-1);

diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 9c6cadec1087131d17d2a5a256c9959f503a56a2..9f44b93f3261c2352298940a9994c1a3ade7b4bb 100644 (file)
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -198,8 +198,10 @@ static struct sis5595_data *sis5595_update_device(struct device *dev);
 static void sis5595_init_client(struct i2c_client *client);
 
 static struct i2c_driver sis5595_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "sis5595",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "sis5595",
+       },
        .attach_adapter = sis5595_detect,
        .detach_client  = sis5595_detach_client,
 };
@@ -484,7 +486,8 @@ static int sis5595_detect(struct i2c_adapter *adapter)
        if (force_addr)
                address = force_addr & ~(SIS5595_EXTENT - 1);
        /* Reserve the ISA region */
-       if (!request_region(address, SIS5595_EXTENT, sis5595_driver.name)) {
+       if (!request_region(address, SIS5595_EXTENT,
+                           sis5595_driver.driver.name)) {
                err = -EBUSY;
                goto exit;
        }

diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 2a3e21b5b6b4443a11bc47387a9ea66ebcbb12c3..02e5d55a2e2d14866ac4663928b551527e2b6e05 100644 (file)
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -226,8 +226,10 @@ static int smsc47b397_detach_client(struct i2c_client *client)
 static int smsc47b397_detect(struct i2c_adapter *adapter);
 
 static struct i2c_driver smsc47b397_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "smsc47b397",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "smsc47b397",
+       },
        .attach_adapter = smsc47b397_detect,
        .detach_client  = smsc47b397_detach_client,
 };
@@ -238,7 +240,8 @@ static int smsc47b397_detect(struct i2c_adapter *adapter)
        struct smsc47b397_data *data;
        int err = 0;
 
-       if (!request_region(address, SMSC_EXTENT, smsc47b397_driver.name)) {
+       if (!request_region(address, SMSC_EXTENT,
+                           smsc47b397_driver.driver.name)) {
                dev_err(&adapter->dev, "Region 0x%x already in use!\n",
                        address);
                return -EBUSY;

diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 5905c1af88f21ab2dd65c358a06b950cd4a004b1..b3051ad7b926efac1fa7bce7bc0929372b2d8e14 100644 (file)
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -126,8 +126,10 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
 
 
 static struct i2c_driver smsc47m1_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "smsc47m1",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "smsc47m1",
+       },
        .attach_adapter = smsc47m1_detect,
        .detach_client  = smsc47m1_detach_client,
 };
@@ -394,7 +396,7 @@ static int smsc47m1_detect(struct i2c_adapter *adapter)
        int err = 0;
        int fan1, fan2, pwm1, pwm2;
 
-       if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.name)) {
+       if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.driver.name)) {
                dev_err(&adapter->dev, "Region 0x%x already in use!\n", address);
                return -EBUSY;
        }

diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 6f696f897176b678b05a11228a775d3abc603c05..db75fbccfb62346ef5da06a565aaae1d2f4fc6a8 100644 (file)
--- 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;

diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index c8556a72a1cd941d14820a5cc142cb8cc36f7934..c2eb54b5207391873fbc30e43ed4722f20492bcf 100644 (file)
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -585,8 +585,10 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr,
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 static struct i2c_driver vt8231_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "vt8231",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "vt8231",
+       },
        .attach_adapter = vt8231_detect,
        .detach_client  = vt8231_detach_client,
 };

diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index eee22a57e929dbf8d09a07693fc28ce8fb96fc8f..94538fb3ef1fbe47518f8698275c3297acaa6df6 100644 (file)
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -676,7 +676,7 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
        int i, err = 0;
 
        if (!request_region(address + REGION_OFFSET, REGION_LENGTH,
-                           w83627ehf_driver.name)) {
+                           w83627ehf_driver.driver.name)) {
                err = -EBUSY;
                goto exit;
        }
@@ -785,8 +785,10 @@ static int w83627ehf_detach_client(struct i2c_client *client)
 }
 
 static struct i2c_driver w83627ehf_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "w83627ehf",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "w83627ehf",
+       },
        .attach_adapter = w83627ehf_detect,
        .detach_client  = w83627ehf_detach_client,
 };

diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 27cfde1cd0232f71e5adee1cbee755e74d835818..2ffb84f9c6b713ef579a510090434d340ac1e272 100644 (file)
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -332,8 +332,10 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev);
 static void w83627hf_init_client(struct i2c_client *client);
 
 static struct i2c_driver w83627hf_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "w83627hf",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "w83627hf",
+       },
        .attach_adapter = w83627hf_detect,
        .detach_client  = w83627hf_detach_client,
 };
@@ -1009,7 +1011,7 @@ static int w83627hf_detect(struct i2c_adapter *adapter)
                address = force_addr & WINB_ALIGNMENT;
 
        if (!request_region(address + WINB_REGION_OFFSET, WINB_REGION_SIZE,
-                           w83627hf_driver.name)) {
+                           w83627hf_driver.driver.name)) {
                err = -EBUSY;
                goto ERROR0;
        }

diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index a78929f2b3d8b8781eaf7849a9b07a3cc9e2a0f0..fd1a59c536302e0d893669e0e7809d9167f2fdff 100644 (file)
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -269,16 +269,20 @@ static struct w83781d_data *w83781d_update_device(struct device *dev);
 static void w83781d_init_client(struct i2c_client *client);
 
 static struct i2c_driver w83781d_driver = {
-       .owner = THIS_MODULE,
-       .name = "w83781d",
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "w83781d",
+       },
        .id = I2C_DRIVERID_W83781D,
        .attach_adapter = w83781d_attach_adapter,
        .detach_client = w83781d_detach_client,
 };
 
 static struct i2c_driver w83781d_isa_driver = {
-       .owner = THIS_MODULE,
-       .name = "w83781d-isa",
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "w83781d-isa",
+       },
        .attach_adapter = w83781d_isa_attach_adapter,
        .detach_client = w83781d_detach_client,
 };
@@ -1011,7 +1015,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
        
        if (is_isa)
                if (!request_region(address, W83781D_EXTENT,
-                                   w83781d_isa_driver.name)) {
+                                   w83781d_isa_driver.driver.name)) {
                        dev_dbg(&adapter->dev, "Request of region "
                                "0x%x-0x%x for w83781d failed\n", address,
                                address + W83781D_EXTENT - 1);

diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 6824243d90d71cd594a4dbec9fd9a1c6e555239e..9018445ac1bfd9687817b030de77d1a4440a7fca 100644 (file)
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -317,8 +317,10 @@ static void w83792d_print_debug(struct w83792d_data *data, struct device *dev);
 static void w83792d_init_client(struct i2c_client *client);
 
 static struct i2c_driver w83792d_driver = {
-       .owner = THIS_MODULE,
-       .name = "w83792d",
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "w83792d",
+       },
        .attach_adapter = w83792d_attach_adapter,
        .detach_client = w83792d_detach_client,
 };

diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 35172fb455d0abe4db1a9948cbc685ed311a5695..fc9f202f296761d642b24bde4888fc571eceec65 100644 (file)
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -92,8 +92,10 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev);
  */
  
 static struct i2c_driver w83l785ts_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "w83l785ts",
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "w83l785ts",
+       },
        .id             = I2C_DRIVERID_W83L785TS,
        .attach_adapter = w83l785ts_attach_adapter,
        .detach_client  = w83l785ts_detach_client,