diff options
author | Laurent Riffard <laurent.riffard@free.fr> | 2005-11-26 14:37:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 01:16:23 -0500 |
commit | cdaf79349c7d24e1d33acb6497849c9e956a33ea (patch) | |
tree | 48f22bb5f215953ac0e57385282fbc5042a03955 /drivers/hwmon/smsc47b397.c | |
parent | a9718b0c1154dcbd955be6aaee47a314cde6a25a (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/hwmon/smsc47b397.c')
-rw-r--r-- | drivers/hwmon/smsc47b397.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c index 2a3e21b5b6b..02e5d55a2e2 100644 --- a/drivers/hwmon/smsc47b397.c +++ b/drivers/hwmon/smsc47b397.c | |||
@@ -226,8 +226,10 @@ static int smsc47b397_detach_client(struct i2c_client *client) | |||
226 | static int smsc47b397_detect(struct i2c_adapter *adapter); | 226 | static int smsc47b397_detect(struct i2c_adapter *adapter); |
227 | 227 | ||
228 | static struct i2c_driver smsc47b397_driver = { | 228 | static 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; |