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/smsc47m1.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/smsc47m1.c')
-rw-r--r-- | drivers/hwmon/smsc47m1.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 | ||
128 | static struct i2c_driver smsc47m1_driver = { | 128 | static 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 | } |