aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/lm78.c
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-08-20 16:46:20 -0400
committerMark M. Hoffman <mhoffman@lightlink.com>2007-10-09 22:56:30 -0400
commit1beeffe43311f64df8dd0ab08ff6b1858c58363f (patch)
tree039324186049a69f3c791165e90404aef497f3cc /drivers/hwmon/lm78.c
parent59a35bafb223bbb0553ba1a3bb9280bda668a8d8 (diff)
hwmon: Convert from class_device to device
Convert from class_device to device for hwmon_device_register/unregister Signed-off-by: Tony Jones <tonyj@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers/hwmon/lm78.c')
-rw-r--r--drivers/hwmon/lm78.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 6eea3476b90c..f5278fda8268 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -131,7 +131,7 @@ static inline int TEMP_FROM_REG(s8 val)
131 the driver field to differentiate between I2C and ISA chips. */ 131 the driver field to differentiate between I2C and ISA chips. */
132struct lm78_data { 132struct lm78_data {
133 struct i2c_client client; 133 struct i2c_client client;
134 struct class_device *class_dev; 134 struct device *hwmon_dev;
135 struct mutex lock; 135 struct mutex lock;
136 enum chips type; 136 enum chips type;
137 137
@@ -585,9 +585,9 @@ static int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
585 if ((err = sysfs_create_group(&new_client->dev.kobj, &lm78_group))) 585 if ((err = sysfs_create_group(&new_client->dev.kobj, &lm78_group)))
586 goto ERROR3; 586 goto ERROR3;
587 587
588 data->class_dev = hwmon_device_register(&new_client->dev); 588 data->hwmon_dev = hwmon_device_register(&new_client->dev);
589 if (IS_ERR(data->class_dev)) { 589 if (IS_ERR(data->hwmon_dev)) {
590 err = PTR_ERR(data->class_dev); 590 err = PTR_ERR(data->hwmon_dev);
591 goto ERROR4; 591 goto ERROR4;
592 } 592 }
593 593
@@ -608,7 +608,7 @@ static int lm78_detach_client(struct i2c_client *client)
608 struct lm78_data *data = i2c_get_clientdata(client); 608 struct lm78_data *data = i2c_get_clientdata(client);
609 int err; 609 int err;
610 610
611 hwmon_device_unregister(data->class_dev); 611 hwmon_device_unregister(data->hwmon_dev);
612 sysfs_remove_group(&client->dev.kobj, &lm78_group); 612 sysfs_remove_group(&client->dev.kobj, &lm78_group);
613 613
614 if ((err = i2c_detach_client(client))) 614 if ((err = i2c_detach_client(client)))
@@ -659,9 +659,9 @@ static int __devinit lm78_isa_probe(struct platform_device *pdev)
659 || (err = device_create_file(&pdev->dev, &dev_attr_name))) 659 || (err = device_create_file(&pdev->dev, &dev_attr_name)))
660 goto exit_remove_files; 660 goto exit_remove_files;
661 661
662 data->class_dev = hwmon_device_register(&pdev->dev); 662 data->hwmon_dev = hwmon_device_register(&pdev->dev);
663 if (IS_ERR(data->class_dev)) { 663 if (IS_ERR(data->hwmon_dev)) {
664 err = PTR_ERR(data->class_dev); 664 err = PTR_ERR(data->hwmon_dev);
665 goto exit_remove_files; 665 goto exit_remove_files;
666 } 666 }
667 667
@@ -681,7 +681,7 @@ static int __devexit lm78_isa_remove(struct platform_device *pdev)
681{ 681{
682 struct lm78_data *data = platform_get_drvdata(pdev); 682 struct lm78_data *data = platform_get_drvdata(pdev);
683 683
684 hwmon_device_unregister(data->class_dev); 684 hwmon_device_unregister(data->hwmon_dev);
685 sysfs_remove_group(&pdev->dev.kobj, &lm78_group); 685 sysfs_remove_group(&pdev->dev.kobj, &lm78_group);
686 device_remove_file(&pdev->dev, &dev_attr_name); 686 device_remove_file(&pdev->dev, &dev_attr_name);
687 release_region(data->client.addr, LM78_EXTENT); 687 release_region(data->client.addr, LM78_EXTENT);