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/w83627hf.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/w83627hf.c')
-rw-r--r-- | drivers/hwmon/w83627hf.c | 8 |
1 files changed, 5 insertions, 3 deletions
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); | |||
332 | static void w83627hf_init_client(struct i2c_client *client); | 332 | static void w83627hf_init_client(struct i2c_client *client); |
333 | 333 | ||
334 | static struct i2c_driver w83627hf_driver = { | 334 | static 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 | } |