Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c97fb4d authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

hwmon: (adm1029) Convert to a new-style i2c driver 



The new-style adm1029 driver implements the optional detect() callback
to cover the use cases of the legacy driver.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Corentin Labbe <corentin.labbe@geomatys.fr>
parent 57f7eb0b

drivers/hwmon/adm1029.c

+44 −53
Original line number Diff line number Diff line
@@ -115,9 +115,11 @@ static const u8 ADM1029_REG_FAN_DIV[] = { 
 * Functions declaration

 */



static int adm1029_attach_adapter(struct i2c_adapter *adapter);

static int adm1029_detect(struct i2c_adapter *adapter, int address, int kind);

static int adm1029_detach_client(struct i2c_client *client);

static int adm1029_probe(struct i2c_client *client,

			 const struct i2c_device_id *id);

static int adm1029_detect(struct i2c_client *client, int kind,

			  struct i2c_board_info *info);

static int adm1029_remove(struct i2c_client *client);

static struct adm1029_data *adm1029_update_device(struct device *dev);

static int adm1029_init_client(struct i2c_client *client);
@@ -125,12 +127,22 @@ static int adm1029_init_client(struct i2c_client *client); 
 * Driver data (common to all clients)

 */



static const struct i2c_device_id adm1029_id[] = {

	{ "adm1029", adm1029 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, adm1029_id);



static struct i2c_driver adm1029_driver = {

	.class		= I2C_CLASS_HWMON,

	.driver = {

		.name = "adm1029",

	},

	.attach_adapter = adm1029_attach_adapter,

	.detach_client = adm1029_detach_client,

	.probe		= adm1029_probe,

	.remove		= adm1029_remove,

	.id_table	= adm1029_id,

	.detect		= adm1029_detect,

	.address_data	= &addr_data,

};



/*
@@ -138,7 +150,6 @@ static struct i2c_driver adm1029_driver = { 
 */



struct adm1029_data {

	struct i2c_client client;

	struct device *hwmon_dev;

	struct mutex update_lock;

	char valid;		/* zero until following fields are valid */
@@ -284,37 +295,14 @@ static const struct attribute_group adm1029_group = { 
 * Real code

 */



static int adm1029_attach_adapter(struct i2c_adapter *adapter)

/* Return 0 if detection is successful, -ENODEV otherwise */

static int adm1029_detect(struct i2c_client *client, int kind,

			  struct i2c_board_info *info)

{

	if (!(adapter->class & I2C_CLASS_HWMON))

		return 0;

	return i2c_probe(adapter, &addr_data, adm1029_detect);

}

	struct i2c_adapter *adapter = client->adapter;



/*

 * The following function does more than just detection. If detection

 * succeeds, it also registers the new chip.

 */



static int adm1029_detect(struct i2c_adapter *adapter, int address, int kind)

{

	struct i2c_client *client;

	struct adm1029_data *data;

	int err = 0;

	const char *name = "";

	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		goto exit;



	if (!(data = kzalloc(sizeof(struct adm1029_data), GFP_KERNEL))) {

		err = -ENOMEM;

		goto exit;

	}



	client = &data->client;

	i2c_set_clientdata(client, data);

	client->addr = address;

	client->adapter = adapter;

	client->driver = &adm1029_driver;

		return -ENODEV;



	/* Now we do the detection and identification. A negative kind

	 * means that the driver was loaded with no force parameter
@@ -362,32 +350,41 @@ static int adm1029_detect(struct i2c_adapter *adapter, int address, int kind) 
		if (kind <= 0) {	/* identification failed */

			pr_debug("adm1029: Unsupported chip (man_id=0x%02X, "

				 "chip_id=0x%02X)\n", man_id, chip_id);

			goto exit_free;

			return -ENODEV;

		}

	}

	strlcpy(info->type, "adm1029", I2C_NAME_SIZE);



	if (kind == adm1029) {

		name = "adm1029";

	return 0;

}



	/* We can fill in the remaining client fields */

	strlcpy(client->name, name, I2C_NAME_SIZE);

	mutex_init(&data->update_lock);

static int adm1029_probe(struct i2c_client *client,

			 const struct i2c_device_id *id)

{

	struct adm1029_data *data;

	int err;



	/* Tell the I2C layer a new client has arrived */

	if ((err = i2c_attach_client(client)))

		goto exit_free;

	data = kzalloc(sizeof(struct adm1029_data), GFP_KERNEL);

	if (!data) {

		err = -ENOMEM;

		goto exit;

	}



	i2c_set_clientdata(client, data);

	mutex_init(&data->update_lock);



	/*

	 * Initialize the ADM1029 chip

	 * Check config register

	 */

	if (adm1029_init_client(client) == 0)

		goto exit_detach;

	if (adm1029_init_client(client) == 0) {

		err = -ENODEV;

		goto exit_free;

	}



	/* Register sysfs hooks */

	if ((err = sysfs_create_group(&client->dev.kobj, &adm1029_group)))

		goto exit_detach;

		goto exit_free;



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

	if (IS_ERR(data->hwmon_dev)) {
@@ -399,8 +396,6 @@ static int adm1029_detect(struct i2c_adapter *adapter, int address, int kind) 


 exit_remove_files:

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

 exit_detach:

	i2c_detach_client(client);

 exit_free:

	kfree(data);

 exit:
@@ -424,17 +419,13 @@ static int adm1029_init_client(struct i2c_client *client) 
	return 1;

}



static int adm1029_detach_client(struct i2c_client *client)

static int adm1029_remove(struct i2c_client *client)

{

	struct adm1029_data *data = i2c_get_clientdata(client);

	int err;



	hwmon_device_unregister(data->hwmon_dev);

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



	if ((err = i2c_detach_client(client)))

		return err;



	kfree(data);

	return 0;

}