Commit 1beeffe4 authored by Tony Jones's avatar Tony Jones Committed by Mark M. Hoffman
Browse files

hwmon: Convert from class_device to device 



Convert from class_device to device for hwmon_device_register/unregister

Signed-off-by: default avatarTony Jones <tonyj@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
parent 59a35baf

drivers/hwmon/abituguru.c

+5 −5
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ MODULE_PARM_DESC(verbose, "How verbose should the driver be? (0-3):\n" 
   The structure is dynamically allocated, at the same time when a new

   abituguru device is allocated. */

struct abituguru_data {

	struct class_device *class_dev; /* hwmon registered device */

	struct device *hwmon_dev;	/* hwmon registered device */

	struct mutex update_lock;	/* protect access to data and uGuru */

	unsigned long last_updated;	/* In jiffies */

	unsigned short addr;		/* uguru base address */
@@ -1287,11 +1287,11 @@ static int __devinit abituguru_probe(struct platform_device *pdev) 
				&abituguru_sysfs_attr[i].dev_attr))

			goto abituguru_probe_error;



	data->class_dev = hwmon_device_register(&pdev->dev);

	if (!IS_ERR(data->class_dev))

	data->hwmon_dev = hwmon_device_register(&pdev->dev);

	if (!IS_ERR(data->hwmon_dev))

		return 0; /* success */



	res = PTR_ERR(data->class_dev);

	res = PTR_ERR(data->hwmon_dev);

abituguru_probe_error:

	for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++)

		device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr);
@@ -1308,7 +1308,7 @@ static int __devexit abituguru_remove(struct platform_device *pdev) 
	int i;

	struct abituguru_data *data = platform_get_drvdata(pdev);



	hwmon_device_unregister(data->class_dev);

	hwmon_device_unregister(data->hwmon_dev);

	for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++)

		device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr);

	for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)

drivers/hwmon/abituguru3.c

+5 −5
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ struct abituguru3_motherboard_info { 
   The structure is dynamically allocated, at the same time when a new

   abituguru3 device is allocated. */

struct abituguru3_data {

	struct class_device *class_dev; /* hwmon registered device */

	struct device *hwmon_dev;	/* hwmon registered device */

	struct mutex update_lock;	/* protect access to data and uGuru */

	unsigned short addr;		/* uguru base address */

	char valid;			/* !=0 if following fields are valid */
@@ -933,9 +933,9 @@ static int __devinit abituguru3_probe(struct platform_device *pdev) 
				&abituguru3_sysfs_attr[i].dev_attr))

			goto abituguru3_probe_error;



	data->class_dev = hwmon_device_register(&pdev->dev);

	if (IS_ERR(data->class_dev)) {

		res = PTR_ERR(data->class_dev);

	data->hwmon_dev = hwmon_device_register(&pdev->dev);

	if (IS_ERR(data->hwmon_dev)) {

		res = PTR_ERR(data->hwmon_dev);

		goto abituguru3_probe_error;

	}
@@ -957,7 +957,7 @@ static int __devexit abituguru3_remove(struct platform_device *pdev) 
	struct abituguru3_data *data = platform_get_drvdata(pdev);



	platform_set_drvdata(pdev, NULL);

	hwmon_device_unregister(data->class_dev);

	hwmon_device_unregister(data->hwmon_dev);

	for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++)

		device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr);

	for (i = 0; i < ARRAY_SIZE(abituguru3_sysfs_attr); i++)

drivers/hwmon/ad7418.c

+5 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static const u8 AD7418_REG_TEMP[] = { AD7418_REG_TEMP_IN, 


struct ad7418_data {

	struct i2c_client	client;

	struct class_device	*class_dev;

	struct device		*hwmon_dev;

	struct attribute_group	attrs;

	enum chips		type;

	struct mutex		lock;
@@ -326,9 +326,9 @@ static int ad7418_detect(struct i2c_adapter *adapter, int address, int kind) 
	if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))

		goto exit_detach;



	data->class_dev = hwmon_device_register(&client->dev);

	if (IS_ERR(data->class_dev)) {

		err = PTR_ERR(data->class_dev);

	data->hwmon_dev = hwmon_device_register(&client->dev);

	if (IS_ERR(data->hwmon_dev)) {

		err = PTR_ERR(data->hwmon_dev);

		goto exit_remove;

	}
@@ -347,7 +347,7 @@ static int ad7418_detect(struct i2c_adapter *adapter, int address, int kind) 
static int ad7418_detach_client(struct i2c_client *client)

{

	struct ad7418_data *data = i2c_get_clientdata(client);

	hwmon_device_unregister(data->class_dev);

	hwmon_device_unregister(data->hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &data->attrs);

	i2c_detach_client(client);

	kfree(data);

drivers/hwmon/adm1021.c

+5 −5
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ clearing it. Weird, ey? --Phil */ 
/* Each client has this additional data */

struct adm1021_data {

	struct i2c_client client;

	struct class_device *class_dev;

	struct device *hwmon_dev;

	enum chips type;



	struct mutex update_lock;
@@ -319,9 +319,9 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind) 
	if ((err = sysfs_create_group(&client->dev.kobj, &adm1021_group)))

		goto error2;



	data->class_dev = hwmon_device_register(&client->dev);

	if (IS_ERR(data->class_dev)) {

		err = PTR_ERR(data->class_dev);

	data->hwmon_dev = hwmon_device_register(&client->dev);

	if (IS_ERR(data->hwmon_dev)) {

		err = PTR_ERR(data->hwmon_dev);

		goto error3;

	}
@@ -351,7 +351,7 @@ static int adm1021_detach_client(struct i2c_client *client) 
	struct adm1021_data *data = i2c_get_clientdata(client);

	int err;



	hwmon_device_unregister(data->class_dev);

	hwmon_device_unregister(data->hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &adm1021_group);



	if ((err = i2c_detach_client(client)))

drivers/hwmon/adm1025.c

+5 −5
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static struct i2c_driver adm1025_driver = { 


struct adm1025_data {

	struct i2c_client client;

	struct class_device *class_dev;

	struct device *hwmon_dev;

	struct mutex update_lock;

	char valid; /* zero until following fields are valid */

	unsigned long last_updated; /* in jiffies */
@@ -472,9 +472,9 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind) 
			goto exit_remove;

	}



	data->class_dev = hwmon_device_register(&new_client->dev);

	if (IS_ERR(data->class_dev)) {

		err = PTR_ERR(data->class_dev);

	data->hwmon_dev = hwmon_device_register(&new_client->dev);

	if (IS_ERR(data->hwmon_dev)) {

		err = PTR_ERR(data->hwmon_dev);

		goto exit_remove;

	}
@@ -538,7 +538,7 @@ static int adm1025_detach_client(struct i2c_client *client) 
	struct adm1025_data *data = i2c_get_clientdata(client);

	int err;



	hwmon_device_unregister(data->class_dev);

	hwmon_device_unregister(data->hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &adm1025_group);

	sysfs_remove_group(&client->dev.kobj, &adm1025_group_opt);