Skip to content

Commit cdaf793

Browse files
Laurent Riffardgregkh
Laurent Riffard
authored and
gregkh
committed
[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 parent a9718b0 commit cdaf793

35 files changed

+166
-86
lines changed

‎drivers/hwmon/adm1021.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@ static int read_only;
126126

127127
/* This is the driver that will be inserted */
128128
static struct i2c_driver adm1021_driver = {
129-
.owner = THIS_MODULE,
130-
.name = "adm1021",
129+
.driver = {
130+
.owner = THIS_MODULE,
131+
.name = "adm1021",
132+
},
131133
.id = I2C_DRIVERID_ADM1021,
132134
.attach_adapter = adm1021_attach_adapter,
133135
.detach_client = adm1021_detach_client,

‎drivers/hwmon/adm1025.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ static struct adm1025_data *adm1025_update_device(struct device *dev);
118118
*/
119119

120120
static struct i2c_driver adm1025_driver = {
121-
.owner = THIS_MODULE,
122-
.name = "adm1025",
121+
.driver = {
122+
.owner = THIS_MODULE,
123+
.name = "adm1025",
124+
},
123125
.id = I2C_DRIVERID_ADM1025,
124126
.attach_adapter = adm1025_attach_adapter,
125127
.detach_client = adm1025_detach_client,

‎drivers/hwmon/adm1026.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,10 @@ static void adm1026_init_client(struct i2c_client *client);
308308

309309

310310
static struct i2c_driver adm1026_driver = {
311-
.owner = THIS_MODULE,
312-
.name = "adm1026",
311+
.driver = {
312+
.owner = THIS_MODULE,
313+
.name = "adm1026",
314+
},
313315
.attach_adapter = adm1026_attach_adapter,
314316
.detach_client = adm1026_detach_client,
315317
};

‎drivers/hwmon/adm1031.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,10 @@ static struct adm1031_data *adm1031_update_device(struct device *dev);
105105

106106
/* This is the driver that will be inserted */
107107
static struct i2c_driver adm1031_driver = {
108-
.owner = THIS_MODULE,
109-
.name = "adm1031",
108+
.driver = {
109+
.owner = THIS_MODULE,
110+
.name = "adm1031",
111+
},
110112
.attach_adapter = adm1031_attach_adapter,
111113
.detach_client = adm1031_detach_client,
112114
};

‎drivers/hwmon/adm9240.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,10 @@ static struct adm9240_data *adm9240_update_device(struct device *dev);
137137

138138
/* driver data */
139139
static struct i2c_driver adm9240_driver = {
140-
.owner = THIS_MODULE,
141-
.name = "adm9240",
140+
.driver = {
141+
.owner = THIS_MODULE,
142+
.name = "adm9240",
143+
},
142144
.id = I2C_DRIVERID_ADM9240,
143145
.attach_adapter = adm9240_attach_adapter,
144146
.detach_client = adm9240_detach_client,

‎drivers/hwmon/asb100.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,10 @@ static struct asb100_data *asb100_update_device(struct device *dev);
217217
static void asb100_init_client(struct i2c_client *client);
218218

219219
static struct i2c_driver asb100_driver = {
220-
.owner = THIS_MODULE,
221-
.name = "asb100",
220+
.driver = {
221+
.owner = THIS_MODULE,
222+
.name = "asb100",
223+
},
222224
.id = I2C_DRIVERID_ASB100,
223225
.attach_adapter = asb100_attach_adapter,
224226
.detach_client = asb100_detach_client,

‎drivers/hwmon/atxp1.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ static struct atxp1_data * atxp1_update_device(struct device *dev);
5050
static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind);
5151

5252
static struct i2c_driver atxp1_driver = {
53-
.owner = THIS_MODULE,
54-
.name = "atxp1",
53+
.driver = {
54+
.owner = THIS_MODULE,
55+
.name = "atxp1",
56+
},
5557
.attach_adapter = atxp1_attach_adapter,
5658
.detach_client = atxp1_detach_client,
5759
};

‎drivers/hwmon/ds1621.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ static struct ds1621_data *ds1621_update_client(struct device *dev);
8989

9090
/* This is the driver that will be inserted */
9191
static struct i2c_driver ds1621_driver = {
92-
.owner = THIS_MODULE,
93-
.name = "ds1621",
92+
.driver = {
93+
.owner = THIS_MODULE,
94+
.name = "ds1621",
95+
},
9496
.id = I2C_DRIVERID_DS1621,
9597
.attach_adapter = ds1621_attach_adapter,
9698
.detach_client = ds1621_detach_client,

‎drivers/hwmon/fscher.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ static int fscher_write_value(struct i2c_client *client, u8 reg, u8 value);
118118
*/
119119

120120
static struct i2c_driver fscher_driver = {
121-
.owner = THIS_MODULE,
122-
.name = "fscher",
121+
.driver = {
122+
.owner = THIS_MODULE,
123+
.name = "fscher",
124+
},
123125
.id = I2C_DRIVERID_FSCHER,
124126
.attach_adapter = fscher_attach_adapter,
125127
.detach_client = fscher_detach_client,

‎drivers/hwmon/fscpos.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,10 @@ static void reset_fan_alarm(struct i2c_client *client, int nr);
100100
* Driver data (common to all clients)
101101
*/
102102
static struct i2c_driver fscpos_driver = {
103-
.owner = THIS_MODULE,
104-
.name = "fscpos",
103+
.driver = {
104+
.owner = THIS_MODULE,
105+
.name = "fscpos",
106+
},
105107
.id = I2C_DRIVERID_FSCPOS,
106108
.attach_adapter = fscpos_attach_adapter,
107109
.detach_client = fscpos_detach_client,

‎drivers/hwmon/gl518sm.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@ static struct gl518_data *gl518_update_device(struct device *dev);
151151

152152
/* This is the driver that will be inserted */
153153
static struct i2c_driver gl518_driver = {
154-
.owner = THIS_MODULE,
155-
.name = "gl518sm",
154+
.driver = {
155+
.owner = THIS_MODULE,
156+
.name = "gl518sm",
157+
},
156158
.id = I2C_DRIVERID_GL518,
157159
.attach_adapter = gl518_attach_adapter,
158160
.detach_client = gl518_detach_client,

‎drivers/hwmon/gl520sm.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,10 @@ static struct gl520_data *gl520_update_device(struct device *dev);
109109

110110
/* Driver data */
111111
static struct i2c_driver gl520_driver = {
112-
.owner = THIS_MODULE,
113-
.name = "gl520sm",
112+
.driver = {
113+
.owner = THIS_MODULE,
114+
.name = "gl520sm",
115+
},
114116
.id = I2C_DRIVERID_GL520,
115117
.attach_adapter = gl520_attach_adapter,
116118
.detach_client = gl520_detach_client,

‎drivers/hwmon/it87.c

+10-5
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,20 @@ static void it87_init_client(struct i2c_client *client, struct it87_data *data);
234234

235235

236236
static struct i2c_driver it87_driver = {
237-
.owner = THIS_MODULE,
238-
.name = "it87",
237+
.driver = {
238+
.owner = THIS_MODULE,
239+
.name = "it87",
240+
},
239241
.id = I2C_DRIVERID_IT87,
240242
.attach_adapter = it87_attach_adapter,
241243
.detach_client = it87_detach_client,
242244
};
243245

244246
static struct i2c_driver it87_isa_driver = {
245-
.owner = THIS_MODULE,
246-
.name = "it87-isa",
247+
.driver = {
248+
.owner = THIS_MODULE,
249+
.name = "it87-isa",
250+
},
247251
.attach_adapter = it87_isa_attach_adapter,
248252
.detach_client = it87_detach_client,
249253
};
@@ -760,7 +764,8 @@ static int it87_detect(struct i2c_adapter *adapter, int address, int kind)
760764

761765
/* Reserve the ISA region */
762766
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))
764769
goto ERROR0;
765770

766771
/* For now, we presume we have a valid client. We create the

‎drivers/hwmon/lm63.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,10 @@ static void lm63_init_client(struct i2c_client *client);
139139
*/
140140

141141
static struct i2c_driver lm63_driver = {
142-
.owner = THIS_MODULE,
143-
.name = "lm63",
142+
.driver = {
143+
.owner = THIS_MODULE,
144+
.name = "lm63",
145+
},
144146
.attach_adapter = lm63_attach_adapter,
145147
.detach_client = lm63_detach_client,
146148
};

‎drivers/hwmon/lm75.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ static struct lm75_data *lm75_update_device(struct device *dev);
6666

6767
/* This is the driver that will be inserted */
6868
static struct i2c_driver lm75_driver = {
69-
.owner = THIS_MODULE,
70-
.name = "lm75",
69+
.driver = {
70+
.owner = THIS_MODULE,
71+
.name = "lm75",
72+
},
7173
.id = I2C_DRIVERID_LM75,
7274
.attach_adapter = lm75_attach_adapter,
7375
.detach_client = lm75_detach_client,

‎drivers/hwmon/lm77.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ static struct lm77_data *lm77_update_device(struct device *dev);
7474

7575
/* This is the driver that will be inserted */
7676
static struct i2c_driver lm77_driver = {
77-
.owner = THIS_MODULE,
78-
.name = "lm77",
77+
.driver = {
78+
.owner = THIS_MODULE,
79+
.name = "lm77",
80+
},
7981
.attach_adapter = lm77_attach_adapter,
8082
.detach_client = lm77_detach_client,
8183
};

‎drivers/hwmon/lm78.c

+9-5
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,20 @@ static void lm78_init_client(struct i2c_client *client);
164164

165165

166166
static struct i2c_driver lm78_driver = {
167-
.owner = THIS_MODULE,
168-
.name = "lm78",
167+
.driver = {
168+
.owner = THIS_MODULE,
169+
.name = "lm78",
170+
},
169171
.id = I2C_DRIVERID_LM78,
170172
.attach_adapter = lm78_attach_adapter,
171173
.detach_client = lm78_detach_client,
172174
};
173175

174176
static struct i2c_driver lm78_isa_driver = {
175-
.owner = THIS_MODULE,
176-
.name = "lm78-isa",
177+
.driver = {
178+
.owner = THIS_MODULE,
179+
.name = "lm78-isa",
180+
},
177181
.attach_adapter = lm78_isa_attach_adapter,
178182
.detach_client = lm78_detach_client,
179183
};
@@ -496,7 +500,7 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
496500
/* Reserve the ISA region */
497501
if (is_isa)
498502
if (!request_region(address, LM78_EXTENT,
499-
lm78_isa_driver.name)) {
503+
lm78_isa_driver.driver.name)) {
500504
err = -EBUSY;
501505
goto ERROR0;
502506
}

‎drivers/hwmon/lm80.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,10 @@ static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value);
143143
*/
144144

145145
static struct i2c_driver lm80_driver = {
146-
.owner = THIS_MODULE,
147-
.name = "lm80",
146+
.driver = {
147+
.owner = THIS_MODULE,
148+
.name = "lm80",
149+
},
148150
.id = I2C_DRIVERID_LM80,
149151
.attach_adapter = lm80_attach_adapter,
150152
.detach_client = lm80_detach_client,

‎drivers/hwmon/lm83.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ static struct lm83_data *lm83_update_device(struct device *dev);
124124
*/
125125

126126
static struct i2c_driver lm83_driver = {
127-
.owner = THIS_MODULE,
128-
.name = "lm83",
127+
.driver = {
128+
.owner = THIS_MODULE,
129+
.name = "lm83",
130+
},
129131
.id = I2C_DRIVERID_LM83,
130132
.attach_adapter = lm83_attach_adapter,
131133
.detach_client = lm83_detach_client,

‎drivers/hwmon/lm85.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,10 @@ static void lm85_init_client(struct i2c_client *client);
380380

381381

382382
static struct i2c_driver lm85_driver = {
383-
.owner = THIS_MODULE,
384-
.name = "lm85",
383+
.driver = {
384+
.owner = THIS_MODULE,
385+
.name = "lm85",
386+
},
385387
.id = I2C_DRIVERID_LM85,
386388
.attach_adapter = lm85_attach_adapter,
387389
.detach_client = lm85_detach_client,

‎drivers/hwmon/lm87.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,10 @@ static struct lm87_data *lm87_update_device(struct device *dev);
161161
*/
162162

163163
static struct i2c_driver lm87_driver = {
164-
.owner = THIS_MODULE,
165-
.name = "lm87",
164+
.driver = {
165+
.owner = THIS_MODULE,
166+
.name = "lm87",
167+
},
166168
.id = I2C_DRIVERID_LM87,
167169
.attach_adapter = lm87_attach_adapter,
168170
.detach_client = lm87_detach_client,

‎drivers/hwmon/lm90.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,10 @@ static struct lm90_data *lm90_update_device(struct device *dev);
186186
*/
187187

188188
static struct i2c_driver lm90_driver = {
189-
.owner = THIS_MODULE,
190-
.name = "lm90",
189+
.driver = {
190+
.owner = THIS_MODULE,
191+
.name = "lm90",
192+
},
191193
.id = I2C_DRIVERID_LM90,
192194
.attach_adapter = lm90_attach_adapter,
193195
.detach_client = lm90_detach_client,

‎drivers/hwmon/lm92.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,10 @@ static int lm92_detach_client(struct i2c_client *client)
410410
*/
411411

412412
static struct i2c_driver lm92_driver = {
413-
.owner = THIS_MODULE,
414-
.name = "lm92",
413+
.driver = {
414+
.owner = THIS_MODULE,
415+
.name = "lm92",
416+
},
415417
.id = I2C_DRIVERID_LM92,
416418
.attach_adapter = lm92_attach_adapter,
417419
.detach_client = lm92_detach_client,

‎drivers/hwmon/max1619.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,10 @@ static struct max1619_data *max1619_update_device(struct device *dev);
9090
*/
9191

9292
static struct i2c_driver max1619_driver = {
93-
.owner = THIS_MODULE,
94-
.name = "max1619",
93+
.driver = {
94+
.owner = THIS_MODULE,
95+
.name = "max1619",
96+
},
9597
.attach_adapter = max1619_attach_adapter,
9698
.detach_client = max1619_detach_client,
9799
};

‎drivers/hwmon/pc87360.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,10 @@ static struct pc87360_data *pc87360_update_device(struct device *dev);
236236
*/
237237

238238
static struct i2c_driver pc87360_driver = {
239-
.owner = THIS_MODULE,
240-
.name = "pc87360",
239+
.driver = {
240+
.owner = THIS_MODULE,
241+
.name = "pc87360",
242+
},
241243
.attach_adapter = pc87360_detect,
242244
.detach_client = pc87360_detach_client,
243245
};
@@ -798,7 +800,7 @@ static int pc87360_detect(struct i2c_adapter *adapter)
798800
for (i = 0; i < 3; i++) {
799801
if (((data->address[i] = extra_isa[i]))
800802
&& !request_region(extra_isa[i], PC87360_EXTENT,
801-
pc87360_driver.name)) {
803+
pc87360_driver.driver.name)) {
802804
dev_err(&new_client->dev, "Region 0x%x-0x%x already "
803805
"in use!\n", extra_isa[i],
804806
extra_isa[i]+PC87360_EXTENT-1);

‎drivers/hwmon/sis5595.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,10 @@ static struct sis5595_data *sis5595_update_device(struct device *dev);
198198
static void sis5595_init_client(struct i2c_client *client);
199199

200200
static struct i2c_driver sis5595_driver = {
201-
.owner = THIS_MODULE,
202-
.name = "sis5595",
201+
.driver = {
202+
.owner = THIS_MODULE,
203+
.name = "sis5595",
204+
},
203205
.attach_adapter = sis5595_detect,
204206
.detach_client = sis5595_detach_client,
205207
};
@@ -484,7 +486,8 @@ static int sis5595_detect(struct i2c_adapter *adapter)
484486
if (force_addr)
485487
address = force_addr & ~(SIS5595_EXTENT - 1);
486488
/* 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)) {
488491
err = -EBUSY;
489492
goto exit;
490493
}

0 commit comments

Comments
 (0)