aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/pc87360.c
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/hwmon/pc87360.c
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/hwmon/pc87360.c')
-rw-r--r--drivers/hwmon/pc87360.c8
1 files changed, 5 insertions, 3 deletions
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);