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

The new-style lm87 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Ben Hutchings <bhutchings@solarflare.com>

hwmon: (lm87) Convert to a new-style i2c driver
The new-style lm87 driver implements the optional detect() callback to cover the use cases of the legacy driver. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Ben Hutchings <bhutchings@solarflare.com>
Jean Delvare · Jean Delvare
1 parent b6aacdcefa
Showing 1 changed file with 46 additions and 53 deletions Side-by-side Diff
drivers/hwmon/lm87.c
@@ -5,7 +5,7 @@
  *                          Philip Edelbrock <phil@netroedge.com>
  *                          Stephen Rousset <stephen.rousset@rocketlogix.com>
  *                          Dan Eaton <dan.eaton@rocketlogix.com>
- * Copyright (C) 2004,2007  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2004-2008  Jean Delvare <khali@linux-fr.org>
  *
  * Original port to Linux 2.6 by Jeff Oliver.
  *
  
  
  
  
@@ -157,22 +157,35 @@
  * Functions declaration
  */
  
-static int lm87_attach_adapter(struct i2c_adapter *adapter);
-static int lm87_detect(struct i2c_adapter *adapter, int address, int kind);
+static int lm87_probe(struct i2c_client *client,
+		      const struct i2c_device_id *id);
+static int lm87_detect(struct i2c_client *new_client, int kind,
+		       struct i2c_board_info *info);
 static void lm87_init_client(struct i2c_client *client);
-static int lm87_detach_client(struct i2c_client *client);
+static int lm87_remove(struct i2c_client *client);
 static struct lm87_data *lm87_update_device(struct device *dev);
  
 /*
  * Driver data (common to all clients)
  */
  
+static const struct i2c_device_id lm87_id[] = {
+	{ "lm87", lm87 },
+	{ "adm1024", adm1024 },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, lm87_id);
+
 static struct i2c_driver lm87_driver = {
+	.class		= I2C_CLASS_HWMON,
 	.driver = {
 		.name	= "lm87",
 	},
-	.attach_adapter	= lm87_attach_adapter,
-	.detach_client	= lm87_detach_client,
+	.probe		= lm87_probe,
+	.remove		= lm87_remove,
+	.id_table	= lm87_id,
+	.detect		= lm87_detect,
+	.address_data	= &addr_data,
 };
  
 /*
@@ -180,7 +193,6 @@
  */
  
 struct lm87_data {
-	struct i2c_client client;
 	struct device *hwmon_dev;
 	struct mutex update_lock;
 	char valid; /* zero until following fields are valid */
@@ -562,13 +574,6 @@
  * Real code
  */
  
-static int lm87_attach_adapter(struct i2c_adapter *adapter)
-{
-	if (!(adapter->class & I2C_CLASS_HWMON))
-		return 0;
-	return i2c_probe(adapter, &addr_data, lm87_detect);
-}
-
 static struct attribute *lm87_attributes[] = {
 	&dev_attr_in1_input.attr,
 	&dev_attr_in1_min.attr,
  
  
  
@@ -656,34 +661,16 @@
 	.attrs = lm87_attributes_opt,
 };
  
-/*
- * The following function does more than just detection. If detection
- * succeeds, it also registers the new chip.
- */
-static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
+/* Return 0 if detection is successful, -ENODEV otherwise */
+static int lm87_detect(struct i2c_client *new_client, int kind,
+		       struct i2c_board_info *info)
 {
-	struct i2c_client *new_client;
-	struct lm87_data *data;
-	int err = 0;
+	struct i2c_adapter *adapter = new_client->adapter;
 	static const char *names[] = { "lm87", "adm1024" };
  
 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-		goto exit;
+		return -ENODEV;
  
-	if (!(data = kzalloc(sizeof(struct lm87_data), GFP_KERNEL))) {
-		err = -ENOMEM;
-		goto exit;
-	}
-
-	/* The common I2C client data is placed right before the
-	   LM87-specific data. */
-	new_client = &data->client;
-	i2c_set_clientdata(new_client, data);
-	new_client->addr = address;
-	new_client->adapter = adapter;
-	new_client->driver = &lm87_driver;
-	new_client->flags = 0;
-
 	/* Default to an LM87 if forced */
 	if (kind == 0)
 		kind = lm87;
  
  
@@ -704,20 +691,32 @@
 		 || (lm87_read_value(new_client, LM87_REG_CONFIG) & 0x80)) {
 			dev_dbg(&adapter->dev,
 				"LM87 detection failed at 0x%02x.\n",
-				address);
-			goto exit_free;
+				new_client->addr);
+			return -ENODEV;
 		}
 	}
  
-	/* We can fill in the remaining client fields */
-	strlcpy(new_client->name, names[kind - 1], I2C_NAME_SIZE);
+	strlcpy(info->type, names[kind - 1], I2C_NAME_SIZE);
+
+	return 0;
+}
+
+static int lm87_probe(struct i2c_client *new_client,
+		      const struct i2c_device_id *id)
+{
+	struct lm87_data *data;
+	int err;
+
+	data = kzalloc(sizeof(struct lm87_data), GFP_KERNEL);
+	if (!data) {
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	i2c_set_clientdata(new_client, data);
 	data->valid = 0;
 	mutex_init(&data->update_lock);
  
-	/* Tell the I2C layer a new client has arrived */
-	if ((err = i2c_attach_client(new_client)))
-		goto exit_free;
-
 	/* Initialize the LM87 chip */
 	lm87_init_client(new_client);
  
@@ -732,7 +731,7 @@
  
 	/* Register sysfs hooks */
 	if ((err = sysfs_create_group(&new_client->dev.kobj, &lm87_group)))
-		goto exit_detach;
+		goto exit_free;
  
 	if (data->channel & CHAN_NO_FAN(0)) {
 		if ((err = device_create_file(&new_client->dev,
@@ -832,8 +831,6 @@
 exit_remove:
 	sysfs_remove_group(&new_client->dev.kobj, &lm87_group);
 	sysfs_remove_group(&new_client->dev.kobj, &lm87_group_opt);
-exit_detach:
-	i2c_detach_client(new_client);
 exit_free:
 	kfree(data);
 exit:
  
  
@@ -877,17 +874,13 @@
 	}
 }
  
-static int lm87_detach_client(struct i2c_client *client)
+static int lm87_remove(struct i2c_client *client)
 {
 	struct lm87_data *data = i2c_get_clientdata(client);
-	int err;
  
 	hwmon_device_unregister(data->hwmon_dev);
 	sysfs_remove_group(&client->dev.kobj, &lm87_group);
 	sysfs_remove_group(&client->dev.kobj, &lm87_group_opt);
-
-	if ((err = i2c_detach_client(client)))
-		return err;
  
 	kfree(data);
 	return 0;
...	...	@@ -5,7 +5,7 @@
5	5	* Philip Edelbrock <phil@netroedge.com>
6	6	* Stephen Rousset <stephen.rousset@rocketlogix.com>
7	7	* Dan Eaton <dan.eaton@rocketlogix.com>
8		- * Copyright (C) 2004,2007 Jean Delvare <khali@linux-fr.org>
	8	+ * Copyright (C) 2004-2008 Jean Delvare <khali@linux-fr.org>
9	9	*
10	10	* Original port to Linux 2.6 by Jeff Oliver.
11	11	*
12	12
13	13
14	14
15	15
...	...	@@ -157,22 +157,35 @@
157	157	* Functions declaration
158	158	*/
159	159
160		-static int lm87_attach_adapter(struct i2c_adapter *adapter);
161		-static int lm87_detect(struct i2c_adapter *adapter, int address, int kind);
	160	+static int lm87_probe(struct i2c_client *client,
	161	+ const struct i2c_device_id *id);
	162	+static int lm87_detect(struct i2c_client *new_client, int kind,
	163	+ struct i2c_board_info *info);
162	164	static void lm87_init_client(struct i2c_client *client);
163		-static int lm87_detach_client(struct i2c_client *client);
	165	+static int lm87_remove(struct i2c_client *client);
164	166	static struct lm87_data lm87_update_device(struct device dev);
165	167
166	168	/*
167	169	* Driver data (common to all clients)
168	170	*/
169	171
	172	+static const struct i2c_device_id lm87_id[] = {
	173	+ { "lm87", lm87 },
	174	+ { "adm1024", adm1024 },
	175	+ { }
	176	+};
	177	+MODULE_DEVICE_TABLE(i2c, lm87_id);
	178	+
170	179	static struct i2c_driver lm87_driver = {
	180	+ .class = I2C_CLASS_HWMON,
171	181	.driver = {
172	182	.name = "lm87",
173	183	},
174		- .attach_adapter = lm87_attach_adapter,
175		- .detach_client = lm87_detach_client,
	184	+ .probe = lm87_probe,
	185	+ .remove = lm87_remove,
	186	+ .id_table = lm87_id,
	187	+ .detect = lm87_detect,
	188	+ .address_data = &addr_data,
176	189	};
177	190
178	191	/*
...	...	@@ -180,7 +193,6 @@
180	193	*/
181	194
182	195	struct lm87_data {
183		- struct i2c_client client;
184	196	struct device *hwmon_dev;
185	197	struct mutex update_lock;
186	198	char valid; /* zero until following fields are valid */
...	...	@@ -562,13 +574,6 @@
562	574	* Real code
563	575	*/
564	576
565		-static int lm87_attach_adapter(struct i2c_adapter *adapter)
566		-{
567		- if (!(adapter->class & I2C_CLASS_HWMON))
568		- return 0;
569		- return i2c_probe(adapter, &addr_data, lm87_detect);
570		-}
571		-
572	577	static struct attribute *lm87_attributes[] = {
573	578	&dev_attr_in1_input.attr,
574	579	&dev_attr_in1_min.attr,
575	580
576	581
577	582
...	...	@@ -656,34 +661,16 @@
656	661	.attrs = lm87_attributes_opt,
657	662	};
658	663
659		-/*
660		- * The following function does more than just detection. If detection
661		- * succeeds, it also registers the new chip.
662		- */
663		-static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
	664	+/* Return 0 if detection is successful, -ENODEV otherwise */
	665	+static int lm87_detect(struct i2c_client *new_client, int kind,
	666	+ struct i2c_board_info *info)
664	667	{
665		- struct i2c_client *new_client;
666		- struct lm87_data *data;
667		- int err = 0;
	668	+ struct i2c_adapter *adapter = new_client->adapter;
668	669	static const char *names[] = { "lm87", "adm1024" };
669	670
670	671	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
671		- goto exit;
	672	+ return -ENODEV;
672	673
673		- if (!(data = kzalloc(sizeof(struct lm87_data), GFP_KERNEL))) {
674		- err = -ENOMEM;
675		- goto exit;
676		- }
677		-
678		- /* The common I2C client data is placed right before the
679		- LM87-specific data. */
680		- new_client = &data->client;
681		- i2c_set_clientdata(new_client, data);
682		- new_client->addr = address;
683		- new_client->adapter = adapter;
684		- new_client->driver = &lm87_driver;
685		- new_client->flags = 0;
686		-
687	674	/* Default to an LM87 if forced */
688	675	if (kind == 0)
689	676	kind = lm87;
690	677
691	678
...	...	@@ -704,20 +691,32 @@
704	691	\|\| (lm87_read_value(new_client, LM87_REG_CONFIG) & 0x80)) {
705	692	dev_dbg(&adapter->dev,
706	693	"LM87 detection failed at 0x%02x.\n",
707		- address);
708		- goto exit_free;
	694	+ new_client->addr);
	695	+ return -ENODEV;
709	696	}
710	697	}
711	698
712		- /* We can fill in the remaining client fields */
713		- strlcpy(new_client->name, names[kind - 1], I2C_NAME_SIZE);
	699	+ strlcpy(info->type, names[kind - 1], I2C_NAME_SIZE);
	700	+
	701	+ return 0;
	702	+}
	703	+
	704	+static int lm87_probe(struct i2c_client *new_client,
	705	+ const struct i2c_device_id *id)
	706	+{
	707	+ struct lm87_data *data;
	708	+ int err;
	709	+
	710	+ data = kzalloc(sizeof(struct lm87_data), GFP_KERNEL);
	711	+ if (!data) {
	712	+ err = -ENOMEM;
	713	+ goto exit;
	714	+ }
	715	+
	716	+ i2c_set_clientdata(new_client, data);
714	717	data->valid = 0;
715	718	mutex_init(&data->update_lock);
716	719
717		- /* Tell the I2C layer a new client has arrived */
718		- if ((err = i2c_attach_client(new_client)))
719		- goto exit_free;
720		-
721	720	/* Initialize the LM87 chip */
722	721	lm87_init_client(new_client);
723	722
...	...	@@ -732,7 +731,7 @@
732	731
733	732	/* Register sysfs hooks */
734	733	if ((err = sysfs_create_group(&new_client->dev.kobj, &lm87_group)))
735		- goto exit_detach;
	734	+ goto exit_free;
736	735
737	736	if (data->channel & CHAN_NO_FAN(0)) {
738	737	if ((err = device_create_file(&new_client->dev,
...	...	@@ -832,8 +831,6 @@
832	831	exit_remove:
833	832	sysfs_remove_group(&new_client->dev.kobj, &lm87_group);
834	833	sysfs_remove_group(&new_client->dev.kobj, &lm87_group_opt);
835		-exit_detach:
836		- i2c_detach_client(new_client);
837	834	exit_free:
838	835	kfree(data);
839	836	exit:
840	837
841	838
...	...	@@ -877,17 +874,13 @@
877	874	}
878	875	}
879	876
880		-static int lm87_detach_client(struct i2c_client *client)
	877	+static int lm87_remove(struct i2c_client *client)
881	878	{
882	879	struct lm87_data *data = i2c_get_clientdata(client);
883		- int err;
884	880
885	881	hwmon_device_unregister(data->hwmon_dev);
886	882	sysfs_remove_group(&client->dev.kobj, &lm87_group);
887	883	sysfs_remove_group(&client->dev.kobj, &lm87_group_opt);
888		-
889		- if ((err = i2c_detach_client(client)))
890		- return err;
891	884
892	885	kfree(data);
893	886	return 0;