aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLaurent Riffard <laurent.riffard@free.fr>2005-11-26 14:37:41 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-06 01:16:23 -0500
commitcdaf79349c7d24e1d33acb6497849c9e956a33ea (patch)
tree48f22bb5f215953ac0e57385282fbc5042a03955 /drivers
parenta9718b0c1154dcbd955be6aaee47a314cde6a25a (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/adm1021.c6
-rw-r--r--drivers/hwmon/adm1025.c6
-rw-r--r--drivers/hwmon/adm1026.c6
-rw-r--r--drivers/hwmon/adm1031.c6
-rw-r--r--drivers/hwmon/adm9240.c6
-rw-r--r--drivers/hwmon/asb100.c6
-rw-r--r--drivers/hwmon/atxp1.c6
-rw-r--r--drivers/hwmon/ds1621.c6
-rw-r--r--drivers/hwmon/fscher.c6
-rw-r--r--drivers/hwmon/fscpos.c6
-rw-r--r--drivers/hwmon/gl518sm.c6
-rw-r--r--drivers/hwmon/gl520sm.c6
-rw-r--r--drivers/hwmon/it87.c15
-rw-r--r--drivers/hwmon/lm63.c6
-rw-r--r--drivers/hwmon/lm75.c6
-rw-r--r--drivers/hwmon/lm77.c6
-rw-r--r--drivers/hwmon/lm78.c14
-rw-r--r--drivers/hwmon/lm80.c6
-rw-r--r--drivers/hwmon/lm83.c6
-rw-r--r--drivers/hwmon/lm85.c6
-rw-r--r--drivers/hwmon/lm87.c6
-rw-r--r--drivers/hwmon/lm90.c6
-rw-r--r--drivers/hwmon/lm92.c6
-rw-r--r--drivers/hwmon/max1619.c6
-rw-r--r--drivers/hwmon/pc87360.c8
-rw-r--r--drivers/hwmon/sis5595.c9
-rw-r--r--drivers/hwmon/smsc47b397.c9
-rw-r--r--drivers/hwmon/smsc47m1.c8
-rw-r--r--drivers/hwmon/via686a.c9
-rw-r--r--drivers/hwmon/vt8231.c6
-rw-r--r--drivers/hwmon/w83627ehf.c8
-rw-r--r--drivers/hwmon/w83627hf.c8
-rw-r--r--drivers/hwmon/w83781d.c14
-rw-r--r--drivers/hwmon/w83792d.c6
-rw-r--r--drivers/hwmon/w83l785ts.c6
35 files changed, 166 insertions, 86 deletions
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 5e6df4b7b857..679cb92ccaf4 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -126,8 +126,10 @@ static int read_only;
126 126
127/* This is the driver that will be inserted */ 127/* This is the driver that will be inserted */
128static struct i2c_driver adm1021_driver = { 128static struct i2c_driver adm1021_driver = {
129 .owner = THIS_MODULE, 129 .driver = {
130 .name = "adm1021", 130 .owner = THIS_MODULE,
131 .name = "adm1021",
132 },
131 .id = I2C_DRIVERID_ADM1021, 133 .id = I2C_DRIVERID_ADM1021,
132 .attach_adapter = adm1021_attach_adapter, 134 .attach_adapter = adm1021_attach_adapter,
133 .detach_client = adm1021_detach_client, 135 .detach_client = adm1021_detach_client,
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index 2be48a7a90b8..3c70622c8cb1 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -118,8 +118,10 @@ static struct adm1025_data *adm1025_update_device(struct device *dev);
118 */ 118 */
119 119
120static struct i2c_driver adm1025_driver = { 120static struct i2c_driver adm1025_driver = {
121 .owner = THIS_MODULE, 121 .driver = {
122 .name = "adm1025", 122 .owner = THIS_MODULE,
123 .name = "adm1025",
124 },
123 .id = I2C_DRIVERID_ADM1025, 125 .id = I2C_DRIVERID_ADM1025,
124 .attach_adapter = adm1025_attach_adapter, 126 .attach_adapter = adm1025_attach_adapter,
125 .detach_client = adm1025_detach_client, 127 .detach_client = adm1025_detach_client,
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 5416db809f97..92fac344d05b 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -308,8 +308,10 @@ static void adm1026_init_client(struct i2c_client *client);
308 308
309 309
310static struct i2c_driver adm1026_driver = { 310static struct i2c_driver adm1026_driver = {
311 .owner = THIS_MODULE, 311 .driver = {
312 .name = "adm1026", 312 .owner = THIS_MODULE,
313 .name = "adm1026",
314 },
313 .attach_adapter = adm1026_attach_adapter, 315 .attach_adapter = adm1026_attach_adapter,
314 .detach_client = adm1026_detach_client, 316 .detach_client = adm1026_detach_client,
315}; 317};
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 1e24428090c4..e42d75e28804 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -105,8 +105,10 @@ static struct adm1031_data *adm1031_update_device(struct device *dev);
105 105
106/* This is the driver that will be inserted */ 106/* This is the driver that will be inserted */
107static struct i2c_driver adm1031_driver = { 107static struct i2c_driver adm1031_driver = {
108 .owner = THIS_MODULE, 108 .driver = {
109 .name = "adm1031", 109 .owner = THIS_MODULE,
110 .name = "adm1031",
111 },
110 .attach_adapter = adm1031_attach_adapter, 112 .attach_adapter = adm1031_attach_adapter,
111 .detach_client = adm1031_detach_client, 113 .detach_client = adm1031_detach_client,
112}; 114};
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 287733fe2c0d..e60309e9726c 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -137,8 +137,10 @@ static struct adm9240_data *adm9240_update_device(struct device *dev);
137 137
138/* driver data */ 138/* driver data */
139static struct i2c_driver adm9240_driver = { 139static struct i2c_driver adm9240_driver = {
140 .owner = THIS_MODULE, 140 .driver = {
141 .name = "adm9240", 141 .owner = THIS_MODULE,
142 .name = "adm9240",
143 },
142 .id = I2C_DRIVERID_ADM9240, 144 .id = I2C_DRIVERID_ADM9240,
143 .attach_adapter = adm9240_attach_adapter, 145 .attach_adapter = adm9240_attach_adapter,
144 .detach_client = adm9240_detach_client, 146 .detach_client = adm9240_detach_client,
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 7227f800bef9..3068de0dc728 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -217,8 +217,10 @@ static struct asb100_data *asb100_update_device(struct device *dev);
217static void asb100_init_client(struct i2c_client *client); 217static void asb100_init_client(struct i2c_client *client);
218 218
219static struct i2c_driver asb100_driver = { 219static struct i2c_driver asb100_driver = {
220 .owner = THIS_MODULE, 220 .driver = {
221 .name = "asb100", 221 .owner = THIS_MODULE,
222 .name = "asb100",
223 },
222 .id = I2C_DRIVERID_ASB100, 224 .id = I2C_DRIVERID_ASB100,
223 .attach_adapter = asb100_attach_adapter, 225 .attach_adapter = asb100_attach_adapter,
224 .detach_client = asb100_detach_client, 226 .detach_client = asb100_detach_client,
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index a60a9f20281b..ed152d939643 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -50,8 +50,10 @@ static struct atxp1_data * atxp1_update_device(struct device *dev);
50static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind); 50static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind);
51 51
52static struct i2c_driver atxp1_driver = { 52static struct i2c_driver atxp1_driver = {
53 .owner = THIS_MODULE, 53 .driver = {
54 .name = "atxp1", 54 .owner = THIS_MODULE,
55 .name = "atxp1",
56 },
55 .attach_adapter = atxp1_attach_adapter, 57 .attach_adapter = atxp1_attach_adapter,
56 .detach_client = atxp1_detach_client, 58 .detach_client = atxp1_detach_client,
57}; 59};
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 0096eb37c663..860094005c14 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -89,8 +89,10 @@ static struct ds1621_data *ds1621_update_client(struct device *dev);
89 89
90/* This is the driver that will be inserted */ 90/* This is the driver that will be inserted */
91static struct i2c_driver ds1621_driver = { 91static struct i2c_driver ds1621_driver = {
92 .owner = THIS_MODULE, 92 .driver = {
93 .name = "ds1621", 93 .owner = THIS_MODULE,
94 .name = "ds1621",
95 },
94 .id = I2C_DRIVERID_DS1621, 96 .id = I2C_DRIVERID_DS1621,
95 .attach_adapter = ds1621_attach_adapter, 97 .attach_adapter = ds1621_attach_adapter,
96 .detach_client = ds1621_detach_client, 98 .detach_client = ds1621_detach_client,
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index f56ca06dbf88..982fff42ce94 100644
--- 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);
118 */ 118 */
119 119
120static struct i2c_driver fscher_driver = { 120static struct i2c_driver fscher_driver = {
121 .owner = THIS_MODULE, 121 .driver = {
122 .name = "fscher", 122 .owner = THIS_MODULE,
123 .name = "fscher",
124 },
123 .id = I2C_DRIVERID_FSCHER, 125 .id = I2C_DRIVERID_FSCHER,
124 .attach_adapter = fscher_attach_adapter, 126 .attach_adapter = fscher_attach_adapter,
125 .detach_client = fscher_detach_client, 127 .detach_client = fscher_detach_client,
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 701dffc2ceed..971146b92cc0 100644
--- 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);
100 * Driver data (common to all clients) 100 * Driver data (common to all clients)
101 */ 101 */
102static struct i2c_driver fscpos_driver = { 102static struct i2c_driver fscpos_driver = {
103 .owner = THIS_MODULE, 103 .driver = {
104 .name = "fscpos", 104 .owner = THIS_MODULE,
105 .name = "fscpos",
106 },
105 .id = I2C_DRIVERID_FSCPOS, 107 .id = I2C_DRIVERID_FSCPOS,
106 .attach_adapter = fscpos_attach_adapter, 108 .attach_adapter = fscpos_attach_adapter,
107 .detach_client = fscpos_detach_client, 109 .detach_client = fscpos_detach_client,
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 5788bbb77d8d..9c5ca1f467a9 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -151,8 +151,10 @@ static struct gl518_data *gl518_update_device(struct device *dev);
151 151
152/* This is the driver that will be inserted */ 152/* This is the driver that will be inserted */
153static struct i2c_driver gl518_driver = { 153static struct i2c_driver gl518_driver = {
154 .owner = THIS_MODULE, 154 .driver = {
155 .name = "gl518sm", 155 .owner = THIS_MODULE,
156 .name = "gl518sm",
157 },
156 .id = I2C_DRIVERID_GL518, 158 .id = I2C_DRIVERID_GL518,
157 .attach_adapter = gl518_attach_adapter, 159 .attach_adapter = gl518_attach_adapter,
158 .detach_client = gl518_detach_client, 160 .detach_client = gl518_detach_client,
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index b3998165193d..a9a724a6f38a 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -109,8 +109,10 @@ static struct gl520_data *gl520_update_device(struct device *dev);
109 109
110/* Driver data */ 110/* Driver data */
111static struct i2c_driver gl520_driver = { 111static struct i2c_driver gl520_driver = {
112 .owner = THIS_MODULE, 112 .driver = {
113 .name = "gl520sm", 113 .owner = THIS_MODULE,
114 .name = "gl520sm",
115 },
114 .id = I2C_DRIVERID_GL520, 116 .id = I2C_DRIVERID_GL520,
115 .attach_adapter = gl520_attach_adapter, 117 .attach_adapter = gl520_attach_adapter,
116 .detach_client = gl520_detach_client, 118 .detach_client = gl520_detach_client,
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);
234 234
235 235
236static struct i2c_driver it87_driver = { 236static struct i2c_driver it87_driver = {
237 .owner = THIS_MODULE, 237 .driver = {
238 .name = "it87", 238 .owner = THIS_MODULE,
239 .name = "it87",
240 },
239 .id = I2C_DRIVERID_IT87, 241 .id = I2C_DRIVERID_IT87,
240 .attach_adapter = it87_attach_adapter, 242 .attach_adapter = it87_attach_adapter,
241 .detach_client = it87_detach_client, 243 .detach_client = it87_detach_client,
242}; 244};
243 245
244static struct i2c_driver it87_isa_driver = { 246static struct i2c_driver it87_isa_driver = {
245 .owner = THIS_MODULE, 247 .driver = {
246 .name = "it87-isa", 248 .owner = THIS_MODULE,
249 .name = "it87-isa",
250 },
247 .attach_adapter = it87_isa_attach_adapter, 251 .attach_adapter = it87_isa_attach_adapter,
248 .detach_client = it87_detach_client, 252 .detach_client = it87_detach_client,
249}; 253};
@@ -760,7 +764,8 @@ static int it87_detect(struct i2c_adapter *adapter, int address, int kind)
760 764
761 /* Reserve the ISA region */ 765 /* Reserve the ISA region */
762 if (is_isa) 766 if (is_isa)
763 if (!request_region(address, IT87_EXTENT, it87_isa_driver.name)) 767 if (!request_region(address, IT87_EXTENT,
768 it87_isa_driver.driver.name))
764 goto ERROR0; 769 goto ERROR0;
765 770
766 /* For now, we presume we have a valid client. We create the 771 /* 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 c2dd4ac8042d..35baae742cff 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -139,8 +139,10 @@ static void lm63_init_client(struct i2c_client *client);
139 */ 139 */
140 140
141static struct i2c_driver lm63_driver = { 141static struct i2c_driver lm63_driver = {
142 .owner = THIS_MODULE, 142 .driver = {
143 .name = "lm63", 143 .owner = THIS_MODULE,
144 .name = "lm63",
145 },
144 .attach_adapter = lm63_attach_adapter, 146 .attach_adapter = lm63_attach_adapter,
145 .detach_client = lm63_detach_client, 147 .detach_client = lm63_detach_client,
146}; 148};
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 0bcbd6515139..db35fbf4d250 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -66,8 +66,10 @@ static struct lm75_data *lm75_update_device(struct device *dev);
66 66
67/* This is the driver that will be inserted */ 67/* This is the driver that will be inserted */
68static struct i2c_driver lm75_driver = { 68static struct i2c_driver lm75_driver = {
69 .owner = THIS_MODULE, 69 .driver = {
70 .name = "lm75", 70 .owner = THIS_MODULE,
71 .name = "lm75",
72 },
71 .id = I2C_DRIVERID_LM75, 73 .id = I2C_DRIVERID_LM75,
72 .attach_adapter = lm75_attach_adapter, 74 .attach_adapter = lm75_attach_adapter,
73 .detach_client = lm75_detach_client, 75 .detach_client = lm75_detach_client,
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index 6a524e92432e..177072056d7d 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -74,8 +74,10 @@ static struct lm77_data *lm77_update_device(struct device *dev);
74 74
75/* This is the driver that will be inserted */ 75/* This is the driver that will be inserted */
76static struct i2c_driver lm77_driver = { 76static struct i2c_driver lm77_driver = {
77 .owner = THIS_MODULE, 77 .driver = {
78 .name = "lm77", 78 .owner = THIS_MODULE,
79 .name = "lm77",
80 },
79 .attach_adapter = lm77_attach_adapter, 81 .attach_adapter = lm77_attach_adapter,
80 .detach_client = lm77_detach_client, 82 .detach_client = lm77_detach_client,
81}; 83};
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);
164 164
165 165
166static struct i2c_driver lm78_driver = { 166static struct i2c_driver lm78_driver = {
167 .owner = THIS_MODULE, 167 .driver = {
168 .name = "lm78", 168 .owner = THIS_MODULE,
169 .name = "lm78",
170 },
169 .id = I2C_DRIVERID_LM78, 171 .id = I2C_DRIVERID_LM78,
170 .attach_adapter = lm78_attach_adapter, 172 .attach_adapter = lm78_attach_adapter,
171 .detach_client = lm78_detach_client, 173 .detach_client = lm78_detach_client,
172}; 174};
173 175
174static struct i2c_driver lm78_isa_driver = { 176static struct i2c_driver lm78_isa_driver = {
175 .owner = THIS_MODULE, 177 .driver = {
176 .name = "lm78-isa", 178 .owner = THIS_MODULE,
179 .name = "lm78-isa",
180 },
177 .attach_adapter = lm78_isa_attach_adapter, 181 .attach_adapter = lm78_isa_attach_adapter,
178 .detach_client = lm78_detach_client, 182 .detach_client = lm78_detach_client,
179}; 183};
@@ -496,7 +500,7 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
496 /* Reserve the ISA region */ 500 /* Reserve the ISA region */
497 if (is_isa) 501 if (is_isa)
498 if (!request_region(address, LM78_EXTENT, 502 if (!request_region(address, LM78_EXTENT,
499 lm78_isa_driver.name)) { 503 lm78_isa_driver.driver.name)) {
500 err = -EBUSY; 504 err = -EBUSY;
501 goto ERROR0; 505 goto ERROR0;
502 } 506 }
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 02303fa0c464..1dc118f411a7 100644
--- 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);
143 */ 143 */
144 144
145static struct i2c_driver lm80_driver = { 145static struct i2c_driver lm80_driver = {
146 .owner = THIS_MODULE, 146 .driver = {
147 .name = "lm80", 147 .owner = THIS_MODULE,
148 .name = "lm80",
149 },
148 .id = I2C_DRIVERID_LM80, 150 .id = I2C_DRIVERID_LM80,
149 .attach_adapter = lm80_attach_adapter, 151 .attach_adapter = lm80_attach_adapter,
150 .detach_client = lm80_detach_client, 152 .detach_client = lm80_detach_client,
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 96cb34ea2490..1c1744f699fb 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -124,8 +124,10 @@ static struct lm83_data *lm83_update_device(struct device *dev);
124 */ 124 */
125 125
126static struct i2c_driver lm83_driver = { 126static struct i2c_driver lm83_driver = {
127 .owner = THIS_MODULE, 127 .driver = {
128 .name = "lm83", 128 .owner = THIS_MODULE,
129 .name = "lm83",
130 },
129 .id = I2C_DRIVERID_LM83, 131 .id = I2C_DRIVERID_LM83,
130 .attach_adapter = lm83_attach_adapter, 132 .attach_adapter = lm83_attach_adapter,
131 .detach_client = lm83_detach_client, 133 .detach_client = lm83_detach_client,
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 131ecab094ac..b537c18c7a12 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -380,8 +380,10 @@ static void lm85_init_client(struct i2c_client *client);
380 380
381 381
382static struct i2c_driver lm85_driver = { 382static struct i2c_driver lm85_driver = {
383 .owner = THIS_MODULE, 383 .driver = {
384 .name = "lm85", 384 .owner = THIS_MODULE,
385 .name = "lm85",
386 },
385 .id = I2C_DRIVERID_LM85, 387 .id = I2C_DRIVERID_LM85,
386 .attach_adapter = lm85_attach_adapter, 388 .attach_adapter = lm85_attach_adapter,
387 .detach_client = lm85_detach_client, 389 .detach_client = lm85_detach_client,
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 26fd0b33beaf..3152c006ce06 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -161,8 +161,10 @@ static struct lm87_data *lm87_update_device(struct device *dev);
161 */ 161 */
162 162
163static struct i2c_driver lm87_driver = { 163static struct i2c_driver lm87_driver = {
164 .owner = THIS_MODULE, 164 .driver = {
165 .name = "lm87", 165 .owner = THIS_MODULE,
166 .name = "lm87",
167 },
166 .id = I2C_DRIVERID_LM87, 168 .id = I2C_DRIVERID_LM87,
167 .attach_adapter = lm87_attach_adapter, 169 .attach_adapter = lm87_attach_adapter,
168 .detach_client = lm87_detach_client, 170 .detach_client = lm87_detach_client,
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 011923b7091d..ff7ba1e1bcc7 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -186,8 +186,10 @@ static struct lm90_data *lm90_update_device(struct device *dev);
186 */ 186 */
187 187
188static struct i2c_driver lm90_driver = { 188static struct i2c_driver lm90_driver = {
189 .owner = THIS_MODULE, 189 .driver = {
190 .name = "lm90", 190 .owner = THIS_MODULE,
191 .name = "lm90",
192 },
191 .id = I2C_DRIVERID_LM90, 193 .id = I2C_DRIVERID_LM90,
192 .attach_adapter = lm90_attach_adapter, 194 .attach_adapter = lm90_attach_adapter,
193 .detach_client = lm90_detach_client, 195 .detach_client = lm90_detach_client,
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 2005a9ee61fb..b4e4a8409d01 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -410,8 +410,10 @@ static int lm92_detach_client(struct i2c_client *client)
410 */ 410 */
411 411
412static struct i2c_driver lm92_driver = { 412static struct i2c_driver lm92_driver = {
413 .owner = THIS_MODULE, 413 .driver = {
414 .name = "lm92", 414 .owner = THIS_MODULE,
415 .name = "lm92",
416 },
415 .id = I2C_DRIVERID_LM92, 417 .id = I2C_DRIVERID_LM92,
416 .attach_adapter = lm92_attach_adapter, 418 .attach_adapter = lm92_attach_adapter,
417 .detach_client = lm92_detach_client, 419 .detach_client = lm92_detach_client,
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index d5aebef126d5..1a50b13a62ae 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -90,8 +90,10 @@ static struct max1619_data *max1619_update_device(struct device *dev);
90 */ 90 */
91 91
92static struct i2c_driver max1619_driver = { 92static struct i2c_driver max1619_driver = {
93 .owner = THIS_MODULE, 93 .driver = {
94 .name = "max1619", 94 .owner = THIS_MODULE,
95 .name = "max1619",
96 },
95 .attach_adapter = max1619_attach_adapter, 97 .attach_adapter = max1619_attach_adapter,
96 .detach_client = max1619_detach_client, 98 .detach_client = max1619_detach_client,
97}; 99};
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 17f745a23d04..5469489c758a 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -236,8 +236,10 @@ static struct pc87360_data *pc87360_update_device(struct device *dev);
236 */ 236 */
237 237
238static struct i2c_driver pc87360_driver = { 238static struct i2c_driver pc87360_driver = {
239 .owner = THIS_MODULE, 239 .driver = {
240 .name = "pc87360", 240 .owner = THIS_MODULE,
241 .name = "pc87360",
242 },
241 .attach_adapter = pc87360_detect, 243 .attach_adapter = pc87360_detect,
242 .detach_client = pc87360_detach_client, 244 .detach_client = pc87360_detach_client,
243}; 245};
@@ -798,7 +800,7 @@ static int pc87360_detect(struct i2c_adapter *adapter)
798 for (i = 0; i < 3; i++) { 800 for (i = 0; i < 3; i++) {
799 if (((data->address[i] = extra_isa[i])) 801 if (((data->address[i] = extra_isa[i]))
800 && !request_region(extra_isa[i], PC87360_EXTENT, 802 && !request_region(extra_isa[i], PC87360_EXTENT,
801 pc87360_driver.name)) { 803 pc87360_driver.driver.name)) {
802 dev_err(&new_client->dev, "Region 0x%x-0x%x already " 804 dev_err(&new_client->dev, "Region 0x%x-0x%x already "
803 "in use!\n", extra_isa[i], 805 "in use!\n", extra_isa[i],
804 extra_isa[i]+PC87360_EXTENT-1); 806 extra_isa[i]+PC87360_EXTENT-1);
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 9c6cadec1087..9f44b93f3261 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -198,8 +198,10 @@ static struct sis5595_data *sis5595_update_device(struct device *dev);
198static void sis5595_init_client(struct i2c_client *client); 198static void sis5595_init_client(struct i2c_client *client);
199 199
200static struct i2c_driver sis5595_driver = { 200static struct i2c_driver sis5595_driver = {
201 .owner = THIS_MODULE, 201 .driver = {
202 .name = "sis5595", 202 .owner = THIS_MODULE,
203 .name = "sis5595",
204 },
203 .attach_adapter = sis5595_detect, 205 .attach_adapter = sis5595_detect,
204 .detach_client = sis5595_detach_client, 206 .detach_client = sis5595_detach_client,
205}; 207};
@@ -484,7 +486,8 @@ static int sis5595_detect(struct i2c_adapter *adapter)
484 if (force_addr) 486 if (force_addr)
485 address = force_addr & ~(SIS5595_EXTENT - 1); 487 address = force_addr & ~(SIS5595_EXTENT - 1);
486 /* Reserve the ISA region */ 488 /* Reserve the ISA region */
487 if (!request_region(address, SIS5595_EXTENT, sis5595_driver.name)) { 489 if (!request_region(address, SIS5595_EXTENT,
490 sis5595_driver.driver.name)) {
488 err = -EBUSY; 491 err = -EBUSY;
489 goto exit; 492 goto exit;
490 } 493 }
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 2a3e21b5b6b4..02e5d55a2e2d 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -226,8 +226,10 @@ static int smsc47b397_detach_client(struct i2c_client *client)
226static int smsc47b397_detect(struct i2c_adapter *adapter); 226static int smsc47b397_detect(struct i2c_adapter *adapter);
227 227
228static struct i2c_driver smsc47b397_driver = { 228static struct i2c_driver smsc47b397_driver = {
229 .owner = THIS_MODULE, 229 .driver = {
230 .name = "smsc47b397", 230 .owner = THIS_MODULE,
231 .name = "smsc47b397",
232 },
231 .attach_adapter = smsc47b397_detect, 233 .attach_adapter = smsc47b397_detect,
232 .detach_client = smsc47b397_detach_client, 234 .detach_client = smsc47b397_detach_client,
233}; 235};
@@ -238,7 +240,8 @@ static int smsc47b397_detect(struct i2c_adapter *adapter)
238 struct smsc47b397_data *data; 240 struct smsc47b397_data *data;
239 int err = 0; 241 int err = 0;
240 242
241 if (!request_region(address, SMSC_EXTENT, smsc47b397_driver.name)) { 243 if (!request_region(address, SMSC_EXTENT,
244 smsc47b397_driver.driver.name)) {
242 dev_err(&adapter->dev, "Region 0x%x already in use!\n", 245 dev_err(&adapter->dev, "Region 0x%x already in use!\n",
243 address); 246 address);
244 return -EBUSY; 247 return -EBUSY;
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 5905c1af88f2..b3051ad7b926 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -126,8 +126,10 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
126 126
127 127
128static struct i2c_driver smsc47m1_driver = { 128static struct i2c_driver smsc47m1_driver = {
129 .owner = THIS_MODULE, 129 .driver = {
130 .name = "smsc47m1", 130 .owner = THIS_MODULE,
131 .name = "smsc47m1",
132 },
131 .attach_adapter = smsc47m1_detect, 133 .attach_adapter = smsc47m1_detect,
132 .detach_client = smsc47m1_detach_client, 134 .detach_client = smsc47m1_detach_client,
133}; 135};
@@ -394,7 +396,7 @@ static int smsc47m1_detect(struct i2c_adapter *adapter)
394 int err = 0; 396 int err = 0;
395 int fan1, fan2, pwm1, pwm2; 397 int fan1, fan2, pwm1, pwm2;
396 398
397 if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.name)) { 399 if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.driver.name)) {
398 dev_err(&adapter->dev, "Region 0x%x already in use!\n", address); 400 dev_err(&adapter->dev, "Region 0x%x already in use!\n", address);
399 return -EBUSY; 401 return -EBUSY;
400 } 402 }
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);
572/* The driver. I choose to use type i2c_driver, as at is identical to both 572/* The driver. I choose to use type i2c_driver, as at is identical to both
573 smbus_driver and isa_driver, and clients could be of either kind */ 573 smbus_driver and isa_driver, and clients could be of either kind */
574static struct i2c_driver via686a_driver = { 574static struct i2c_driver via686a_driver = {
575 .owner = THIS_MODULE, 575 .driver = {
576 .name = "via686a", 576 .owner = THIS_MODULE,
577 .name = "via686a",
578 },
577 .attach_adapter = via686a_detect, 579 .attach_adapter = via686a_detect,
578 .detach_client = via686a_detach_client, 580 .detach_client = via686a_detach_client,
579}; 581};
@@ -615,7 +617,8 @@ static int via686a_detect(struct i2c_adapter *adapter)
615 } 617 }
616 618
617 /* Reserve the ISA region */ 619 /* Reserve the ISA region */
618 if (!request_region(address, VIA686A_EXTENT, via686a_driver.name)) { 620 if (!request_region(address, VIA686A_EXTENT,
621 via686a_driver.driver.name)) {
619 dev_err(&adapter->dev, "region 0x%x already in use!\n", 622 dev_err(&adapter->dev, "region 0x%x already in use!\n",
620 address); 623 address);
621 return -ENODEV; 624 return -ENODEV;
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index c8556a72a1cd..c2eb54b52073 100644
--- 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,
585static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); 585static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
586 586
587static struct i2c_driver vt8231_driver = { 587static struct i2c_driver vt8231_driver = {
588 .owner = THIS_MODULE, 588 .driver = {
589 .name = "vt8231", 589 .owner = THIS_MODULE,
590 .name = "vt8231",
591 },
590 .attach_adapter = vt8231_detect, 592 .attach_adapter = vt8231_detect,
591 .detach_client = vt8231_detach_client, 593 .detach_client = vt8231_detach_client,
592}; 594};
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index eee22a57e929..94538fb3ef1f 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -676,7 +676,7 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
676 int i, err = 0; 676 int i, err = 0;
677 677
678 if (!request_region(address + REGION_OFFSET, REGION_LENGTH, 678 if (!request_region(address + REGION_OFFSET, REGION_LENGTH,
679 w83627ehf_driver.name)) { 679 w83627ehf_driver.driver.name)) {
680 err = -EBUSY; 680 err = -EBUSY;
681 goto exit; 681 goto exit;
682 } 682 }
@@ -785,8 +785,10 @@ static int w83627ehf_detach_client(struct i2c_client *client)
785} 785}
786 786
787static struct i2c_driver w83627ehf_driver = { 787static struct i2c_driver w83627ehf_driver = {
788 .owner = THIS_MODULE, 788 .driver = {
789 .name = "w83627ehf", 789 .owner = THIS_MODULE,
790 .name = "w83627ehf",
791 },
790 .attach_adapter = w83627ehf_detect, 792 .attach_adapter = w83627ehf_detect,
791 .detach_client = w83627ehf_detach_client, 793 .detach_client = w83627ehf_detach_client,
792}; 794};
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 27cfde1cd023..2ffb84f9c6b7 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -332,8 +332,10 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev);
332static void w83627hf_init_client(struct i2c_client *client); 332static void w83627hf_init_client(struct i2c_client *client);
333 333
334static struct i2c_driver w83627hf_driver = { 334static struct i2c_driver w83627hf_driver = {
335 .owner = THIS_MODULE, 335 .driver = {
336 .name = "w83627hf", 336 .owner = THIS_MODULE,
337 .name = "w83627hf",
338 },
337 .attach_adapter = w83627hf_detect, 339 .attach_adapter = w83627hf_detect,
338 .detach_client = w83627hf_detach_client, 340 .detach_client = w83627hf_detach_client,
339}; 341};
@@ -1009,7 +1011,7 @@ static int w83627hf_detect(struct i2c_adapter *adapter)
1009 address = force_addr & WINB_ALIGNMENT; 1011 address = force_addr & WINB_ALIGNMENT;
1010 1012
1011 if (!request_region(address + WINB_REGION_OFFSET, WINB_REGION_SIZE, 1013 if (!request_region(address + WINB_REGION_OFFSET, WINB_REGION_SIZE,
1012 w83627hf_driver.name)) { 1014 w83627hf_driver.driver.name)) {
1013 err = -EBUSY; 1015 err = -EBUSY;
1014 goto ERROR0; 1016 goto ERROR0;
1015 } 1017 }
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index a78929f2b3d8..fd1a59c53630 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -269,16 +269,20 @@ static struct w83781d_data *w83781d_update_device(struct device *dev);
269static void w83781d_init_client(struct i2c_client *client); 269static void w83781d_init_client(struct i2c_client *client);
270 270
271static struct i2c_driver w83781d_driver = { 271static struct i2c_driver w83781d_driver = {
272 .owner = THIS_MODULE, 272 .driver = {
273 .name = "w83781d", 273 .owner = THIS_MODULE,
274 .name = "w83781d",
275 },
274 .id = I2C_DRIVERID_W83781D, 276 .id = I2C_DRIVERID_W83781D,
275 .attach_adapter = w83781d_attach_adapter, 277 .attach_adapter = w83781d_attach_adapter,
276 .detach_client = w83781d_detach_client, 278 .detach_client = w83781d_detach_client,
277}; 279};
278 280
279static struct i2c_driver w83781d_isa_driver = { 281static struct i2c_driver w83781d_isa_driver = {
280 .owner = THIS_MODULE, 282 .driver = {
281 .name = "w83781d-isa", 283 .owner = THIS_MODULE,
284 .name = "w83781d-isa",
285 },
282 .attach_adapter = w83781d_isa_attach_adapter, 286 .attach_adapter = w83781d_isa_attach_adapter,
283 .detach_client = w83781d_detach_client, 287 .detach_client = w83781d_detach_client,
284}; 288};
@@ -1011,7 +1015,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
1011 1015
1012 if (is_isa) 1016 if (is_isa)
1013 if (!request_region(address, W83781D_EXTENT, 1017 if (!request_region(address, W83781D_EXTENT,
1014 w83781d_isa_driver.name)) { 1018 w83781d_isa_driver.driver.name)) {
1015 dev_dbg(&adapter->dev, "Request of region " 1019 dev_dbg(&adapter->dev, "Request of region "
1016 "0x%x-0x%x for w83781d failed\n", address, 1020 "0x%x-0x%x for w83781d failed\n", address,
1017 address + W83781D_EXTENT - 1); 1021 address + W83781D_EXTENT - 1);
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 6824243d90d7..9018445ac1bf 100644
--- 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);
317static void w83792d_init_client(struct i2c_client *client); 317static void w83792d_init_client(struct i2c_client *client);
318 318
319static struct i2c_driver w83792d_driver = { 319static struct i2c_driver w83792d_driver = {
320 .owner = THIS_MODULE, 320 .driver = {
321 .name = "w83792d", 321 .owner = THIS_MODULE,
322 .name = "w83792d",
323 },
322 .attach_adapter = w83792d_attach_adapter, 324 .attach_adapter = w83792d_attach_adapter,
323 .detach_client = w83792d_detach_client, 325 .detach_client = w83792d_detach_client,
324}; 326};
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 35172fb455d0..fc9f202f2967 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -92,8 +92,10 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev);
92 */ 92 */
93 93
94static struct i2c_driver w83l785ts_driver = { 94static struct i2c_driver w83l785ts_driver = {
95 .owner = THIS_MODULE, 95 .driver = {
96 .name = "w83l785ts", 96 .owner = THIS_MODULE,
97 .name = "w83l785ts",
98 },
97 .id = I2C_DRIVERID_W83L785TS, 99 .id = I2C_DRIVERID_W83L785TS,
98 .attach_adapter = w83l785ts_attach_adapter, 100 .attach_adapter = w83l785ts_attach_adapter,
99 .detach_client = w83l785ts_detach_client, 101 .detach_client = w83l785ts_detach_client,