hwmon/smsc47b397: Convert to a platform driver

Convert the smsc47b397 driver from the nonsensical i2c-isa hack to a regular platform driver. Signed-off-by: Jean Delvare <khali@linux-fr.org>

hwmon/smsc47b397: Convert to a platform driver
Convert the smsc47b397 driver from the nonsensical i2c-isa hack to a regular platform driver. Signed-off-by: Jean Delvare <khali@linux-fr.org>
Jean Delvare · Jean Delvare
1 parent f5f8d38b18
Showing 2 changed files with 109 additions and 58 deletions Side-by-side Diff
drivers/hwmon/Kconfig
drivers/hwmon/smsc47b397.c
@@ -477,8 +477,7 @@
  
 config SENSORS_SMSC47B397
 	tristate "SMSC LPC47B397-NC"
-	depends on HWMON && I2C && EXPERIMENTAL
-	select I2C_ISA
+	depends on HWMON && EXPERIMENTAL
 	help
 	  If you say yes here you get support for the SMSC LPC47B397-NC
 	  sensor chip.
@@ -30,17 +30,17 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
-#include <linux/i2c.h>
-#include <linux/i2c-isa.h>
+#include <linux/platform_device.h>
 #include <linux/hwmon.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
 #include <asm/io.h>
  
-/* Address is autodetected, there is no default value */
-static unsigned short address;
+static struct platform_device *pdev;
  
+#define DRVNAME "smsc47b397"
+
 /* Super-I/0 registers and commands */
  
 #define	REG	0x2e	/* The register to read/write */
@@ -91,7 +91,8 @@
 #define SMSC47B397_REG_FAN_MSB(nr) (0x29 + 2 * (nr))
  
 struct smsc47b397_data {
-	struct i2c_client client;
+	unsigned short addr;
+	const char *name;
 	struct class_device *class_dev;
 	struct mutex lock;
  
  
  
  
  
  
  
  
  
@@ -104,45 +105,43 @@
 	u8 temp[4];
 };
  
-static int smsc47b397_read_value(struct i2c_client *client, u8 reg)
+static int smsc47b397_read_value(struct smsc47b397_data* data, u8 reg)
 {
-	struct smsc47b397_data *data = i2c_get_clientdata(client);
 	int res;
  
 	mutex_lock(&data->lock);
-	outb(reg, client->addr);
-	res = inb_p(client->addr + 1);
+	outb(reg, data->addr);
+	res = inb_p(data->addr + 1);
 	mutex_unlock(&data->lock);
 	return res;
 }
  
 static struct smsc47b397_data *smsc47b397_update_device(struct device *dev)
 {
- 	struct i2c_client *client = to_i2c_client(dev);
-	struct smsc47b397_data *data = i2c_get_clientdata(client);
+	struct smsc47b397_data *data = dev_get_drvdata(dev);
 	int i;
  
 	mutex_lock(&data->update_lock);
  
 	if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
-		dev_dbg(&client->dev, "starting device update...\n");
+		dev_dbg(dev, "starting device update...\n");
  
 		/* 4 temperature inputs, 4 fan inputs */
 		for (i = 0; i < 4; i++) {
-			data->temp[i] = smsc47b397_read_value(client,
+			data->temp[i] = smsc47b397_read_value(data,
 					SMSC47B397_REG_TEMP(i));
  
 			/* must read LSB first */
-			data->fan[i]  = smsc47b397_read_value(client,
+			data->fan[i]  = smsc47b397_read_value(data,
 					SMSC47B397_REG_FAN_LSB(i));
-			data->fan[i] |= smsc47b397_read_value(client,
+			data->fan[i] |= smsc47b397_read_value(data,
 					SMSC47B397_REG_FAN_MSB(i)) << 8;
 		}
  
 		data->last_updated = jiffies;
 		data->valid = 1;
  
-		dev_dbg(&client->dev, "... device update complete\n");
+		dev_dbg(dev, "... device update complete\n");
 	}
  
 	mutex_unlock(&data->update_lock);
@@ -202,6 +201,14 @@
 sysfs_fan(3);
 sysfs_fan(4);
  
+static ssize_t show_name(struct device *dev, struct device_attribute
+			 *devattr, char *buf)
+{
+	struct smsc47b397_data *data = dev_get_drvdata(dev);
+	return sprintf(buf, "%s\n", data->name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+
 static struct attribute *smsc47b397_attributes[] = {
 	&dev_attr_temp1_input.attr,
 	&dev_attr_temp2_input.attr,
@@ -212,6 +219,7 @@
 	&dev_attr_fan3_input.attr,
 	&dev_attr_fan4_input.attr,
  
+	&dev_attr_name.attr,
 	NULL
 };
  
  
  
  
  
  
  
  
  
  
  
  
@@ -219,44 +227,44 @@
 	.attrs = smsc47b397_attributes,
 };
  
-static int smsc47b397_detach_client(struct i2c_client *client)
+static int __devexit smsc47b397_remove(struct platform_device *pdev)
 {
-	struct smsc47b397_data *data = i2c_get_clientdata(client);
-	int err;
+	struct smsc47b397_data *data = platform_get_drvdata(pdev);
+	struct resource *res;
  
 	hwmon_device_unregister(data->class_dev);
-	sysfs_remove_group(&client->dev.kobj, &smsc47b397_group);
-
-	if ((err = i2c_detach_client(client)))
-		return err;
-
-	release_region(client->addr, SMSC_EXTENT);
+	sysfs_remove_group(&pdev->dev.kobj, &smsc47b397_group);
+	res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+	release_region(res->start, SMSC_EXTENT);
 	kfree(data);
  
 	return 0;
 }
  
-static int smsc47b397_detect(struct i2c_adapter *adapter);
+static int smsc47b397_probe(struct platform_device *pdev);
  
-static struct i2c_driver smsc47b397_driver = {
+static struct platform_driver smsc47b397_driver = {
 	.driver = {
 		.owner	= THIS_MODULE,
-		.name	= "smsc47b397",
+		.name	= DRVNAME,
 	},
-	.attach_adapter	= smsc47b397_detect,
-	.detach_client	= smsc47b397_detach_client,
+	.probe		= smsc47b397_probe,
+	.remove		= __devexit_p(smsc47b397_remove),
 };
  
-static int smsc47b397_detect(struct i2c_adapter *adapter)
+static int __devinit smsc47b397_probe(struct platform_device *pdev)
 {
-	struct i2c_client *new_client;
+	struct device *dev = &pdev->dev;
 	struct smsc47b397_data *data;
+	struct resource *res;
 	int err = 0;
  
-	if (!request_region(address, SMSC_EXTENT,
+	res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+	if (!request_region(res->start, SMSC_EXTENT,
 			    smsc47b397_driver.driver.name)) {
-		dev_err(&adapter->dev, "Region 0x%x already in use!\n",
-			address);
+		dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+			(unsigned long)res->start,
+			(unsigned long)res->start + SMSC_EXTENT - 1);
 		return -EBUSY;
 	}
  
  
  
  
  
@@ -265,25 +273,16 @@
 		goto error_release;
 	}
  
-	new_client = &data->client;
-	i2c_set_clientdata(new_client, data);
-	new_client->addr = address;
+	data->addr = res->start;
+	data->name = "smsc47b397";
 	mutex_init(&data->lock);
-	new_client->adapter = adapter;
-	new_client->driver = &smsc47b397_driver;
-	new_client->flags = 0;
-
-	strlcpy(new_client->name, "smsc47b397", I2C_NAME_SIZE);
-
 	mutex_init(&data->update_lock);
+	platform_set_drvdata(pdev, data);
  
-	if ((err = i2c_attach_client(new_client)))
+	if ((err = sysfs_create_group(&dev->kobj, &smsc47b397_group)))
 		goto error_free;
  
-	if ((err = sysfs_create_group(&new_client->dev.kobj, &smsc47b397_group)))
-		goto error_detach;
-
-	data->class_dev = hwmon_device_register(&new_client->dev);
+	data->class_dev = hwmon_device_register(dev);
 	if (IS_ERR(data->class_dev)) {
 		err = PTR_ERR(data->class_dev);
 		goto error_remove;
  
  
@@ -292,16 +291,53 @@
 	return 0;
  
 error_remove:
-	sysfs_remove_group(&new_client->dev.kobj, &smsc47b397_group);
-error_detach:
-	i2c_detach_client(new_client);
+	sysfs_remove_group(&dev->kobj, &smsc47b397_group);
 error_free:
 	kfree(data);
 error_release:
-	release_region(address, SMSC_EXTENT);
+	release_region(res->start, SMSC_EXTENT);
 	return err;
 }
  
+static int __init smsc47b397_device_add(unsigned short address)
+{
+	struct resource res = {
+		.start	= address,
+		.end	= address + SMSC_EXTENT - 1,
+		.name	= DRVNAME,
+		.flags	= IORESOURCE_IO,
+	};
+	int err;
+
+	pdev = platform_device_alloc(DRVNAME, address);
+	if (!pdev) {
+		err = -ENOMEM;
+		printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+		goto exit;
+	}
+
+	err = platform_device_add_resources(pdev, &res, 1);
+	if (err) {
+		printk(KERN_ERR DRVNAME ": Device resource addition failed "
+		       "(%d)\n", err);
+		goto exit_device_put;
+	}
+
+	err = platform_device_add(pdev);
+	if (err) {
+		printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
+		       err);
+		goto exit_device_put;
+	}
+
+	return 0;
+
+exit_device_put:
+	platform_device_put(pdev);
+exit:
+	return err;
+}
+
 static int __init smsc47b397_find(unsigned short *addr)
 {
 	u8 id, rev;
@@ -320,7 +356,7 @@
 	*addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8)
 		 |  superio_inb(SUPERIO_REG_BASE_LSB);
  
-	printk(KERN_INFO "smsc47b397: found SMSC %s "
+	printk(KERN_INFO DRVNAME ": found SMSC %s "
 		"(base address 0x%04x, revision %u)\n",
 		id == 0x81 ? "SCH5307-NS" : "LPC47B397-NC", *addr, rev);
  
  
  
@@ -330,17 +366,33 @@
  
 static int __init smsc47b397_init(void)
 {
+	unsigned short address;
 	int ret;
  
 	if ((ret = smsc47b397_find(&address)))
 		return ret;
  
-	return i2c_isa_add_driver(&smsc47b397_driver);
+	ret = platform_driver_register(&smsc47b397_driver);
+	if (ret)
+		goto exit;
+
+	/* Sets global pdev as a side effect */
+	ret = smsc47b397_device_add(address);
+	if (ret)
+		goto exit_driver;
+
+	return 0;
+
+exit_driver:
+	platform_driver_unregister(&smsc47b397_driver);
+exit:
+	return ret;
 }
  
 static void __exit smsc47b397_exit(void)
 {
-	i2c_isa_del_driver(&smsc47b397_driver);
+	platform_device_unregister(pdev);
+	platform_driver_unregister(&smsc47b397_driver);
 }
  
 MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
...	...	@@ -477,8 +477,7 @@
477	477
478	478	config SENSORS_SMSC47B397
479	479	tristate "SMSC LPC47B397-NC"
480		- depends on HWMON && I2C && EXPERIMENTAL
481		- select I2C_ISA
	480	+ depends on HWMON && EXPERIMENTAL
482	481	help
483	482	If you say yes here you get support for the SMSC LPC47B397-NC
484	483	sensor chip.
...	...	@@ -30,17 +30,17 @@
30	30	#include <linux/slab.h>
31	31	#include <linux/ioport.h>
32	32	#include <linux/jiffies.h>
33		-#include <linux/i2c.h>
34		-#include <linux/i2c-isa.h>
	33	+#include <linux/platform_device.h>
35	34	#include <linux/hwmon.h>
36	35	#include <linux/err.h>
37	36	#include <linux/init.h>
38	37	#include <linux/mutex.h>
39	38	#include <asm/io.h>
40	39
41		-/* Address is autodetected, there is no default value */
42		-static unsigned short address;
	40	+static struct platform_device *pdev;
43	41
	42	+#define DRVNAME "smsc47b397"
	43	+
44	44	/* Super-I/0 registers and commands */
45	45
46	46	#define REG 0x2e /* The register to read/write */
...	...	@@ -91,7 +91,8 @@
91	91	#define SMSC47B397_REG_FAN_MSB(nr) (0x29 + 2 * (nr))
92	92
93	93	struct smsc47b397_data {
94		- struct i2c_client client;
	94	+ unsigned short addr;
	95	+ const char *name;
95	96	struct class_device *class_dev;
96	97	struct mutex lock;
97	98
98	99
99	100
100	101
101	102
102	103
103	104
104	105
105	106
...	...	@@ -104,45 +105,43 @@
104	105	u8 temp[4];
105	106	};
106	107
107		-static int smsc47b397_read_value(struct i2c_client *client, u8 reg)
	108	+static int smsc47b397_read_value(struct smsc47b397_data* data, u8 reg)
108	109	{
109		- struct smsc47b397_data *data = i2c_get_clientdata(client);
110	110	int res;
111	111
112	112	mutex_lock(&data->lock);
113		- outb(reg, client->addr);
114		- res = inb_p(client->addr + 1);
	113	+ outb(reg, data->addr);
	114	+ res = inb_p(data->addr + 1);
115	115	mutex_unlock(&data->lock);
116	116	return res;
117	117	}
118	118
119	119	static struct smsc47b397_data smsc47b397_update_device(struct device dev)
120	120	{
121		- struct i2c_client *client = to_i2c_client(dev);
122		- struct smsc47b397_data *data = i2c_get_clientdata(client);
	121	+ struct smsc47b397_data *data = dev_get_drvdata(dev);
123	122	int i;
124	123
125	124	mutex_lock(&data->update_lock);
126	125
127	126	if (time_after(jiffies, data->last_updated + HZ) \|\| !data->valid) {
128		- dev_dbg(&client->dev, "starting device update...\n");
	127	+ dev_dbg(dev, "starting device update...\n");
129	128
130	129	/* 4 temperature inputs, 4 fan inputs */
131	130	for (i = 0; i < 4; i++) {
132		- data->temp[i] = smsc47b397_read_value(client,
	131	+ data->temp[i] = smsc47b397_read_value(data,
133	132	SMSC47B397_REG_TEMP(i));
134	133
135	134	/* must read LSB first */
136		- data->fan[i] = smsc47b397_read_value(client,
	135	+ data->fan[i] = smsc47b397_read_value(data,
137	136	SMSC47B397_REG_FAN_LSB(i));
138		- data->fan[i] \|= smsc47b397_read_value(client,
	137	+ data->fan[i] \|= smsc47b397_read_value(data,
139	138	SMSC47B397_REG_FAN_MSB(i)) << 8;
140	139	}
141	140
142	141	data->last_updated = jiffies;
143	142	data->valid = 1;
144	143
145		- dev_dbg(&client->dev, "... device update complete\n");
	144	+ dev_dbg(dev, "... device update complete\n");
146	145	}
147	146
148	147	mutex_unlock(&data->update_lock);
...	...	@@ -202,6 +201,14 @@
202	201	sysfs_fan(3);
203	202	sysfs_fan(4);
204	203
	204	+static ssize_t show_name(struct device *dev, struct device_attribute
	205	+ devattr, char buf)
	206	+{
	207	+ struct smsc47b397_data *data = dev_get_drvdata(dev);
	208	+ return sprintf(buf, "%s\n", data->name);
	209	+}
	210	+static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
	211	+
205	212	static struct attribute *smsc47b397_attributes[] = {
206	213	&dev_attr_temp1_input.attr,
207	214	&dev_attr_temp2_input.attr,
...	...	@@ -212,6 +219,7 @@
212	219	&dev_attr_fan3_input.attr,
213	220	&dev_attr_fan4_input.attr,
214	221
	222	+ &dev_attr_name.attr,
215	223	NULL
216	224	};
217	225
218	226
219	227
220	228
221	229
222	230
223	231
224	232
225	233
226	234
227	235
228	236
...	...	@@ -219,44 +227,44 @@
219	227	.attrs = smsc47b397_attributes,
220	228	};
221	229
222		-static int smsc47b397_detach_client(struct i2c_client *client)
	230	+static int __devexit smsc47b397_remove(struct platform_device *pdev)
223	231	{
224		- struct smsc47b397_data *data = i2c_get_clientdata(client);
225		- int err;
	232	+ struct smsc47b397_data *data = platform_get_drvdata(pdev);
	233	+ struct resource *res;
226	234
227	235	hwmon_device_unregister(data->class_dev);
228		- sysfs_remove_group(&client->dev.kobj, &smsc47b397_group);
229		-
230		- if ((err = i2c_detach_client(client)))
231		- return err;
232		-
233		- release_region(client->addr, SMSC_EXTENT);
	236	+ sysfs_remove_group(&pdev->dev.kobj, &smsc47b397_group);
	237	+ res = platform_get_resource(pdev, IORESOURCE_IO, 0);
	238	+ release_region(res->start, SMSC_EXTENT);
234	239	kfree(data);
235	240
236	241	return 0;
237	242	}
238	243
239		-static int smsc47b397_detect(struct i2c_adapter *adapter);
	244	+static int smsc47b397_probe(struct platform_device *pdev);
240	245
241		-static struct i2c_driver smsc47b397_driver = {
	246	+static struct platform_driver smsc47b397_driver = {
242	247	.driver = {
243	248	.owner = THIS_MODULE,
244		- .name = "smsc47b397",
	249	+ .name = DRVNAME,
245	250	},
246		- .attach_adapter = smsc47b397_detect,
247		- .detach_client = smsc47b397_detach_client,
	251	+ .probe = smsc47b397_probe,
	252	+ .remove = __devexit_p(smsc47b397_remove),
248	253	};
249	254
250		-static int smsc47b397_detect(struct i2c_adapter *adapter)
	255	+static int __devinit smsc47b397_probe(struct platform_device *pdev)
251	256	{
252		- struct i2c_client *new_client;
	257	+ struct device *dev = &pdev->dev;
253	258	struct smsc47b397_data *data;
	259	+ struct resource *res;
254	260	int err = 0;
255	261
256		- if (!request_region(address, SMSC_EXTENT,
	262	+ res = platform_get_resource(pdev, IORESOURCE_IO, 0);
	263	+ if (!request_region(res->start, SMSC_EXTENT,
257	264	smsc47b397_driver.driver.name)) {
258		- dev_err(&adapter->dev, "Region 0x%x already in use!\n",
259		- address);
	265	+ dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
	266	+ (unsigned long)res->start,
	267	+ (unsigned long)res->start + SMSC_EXTENT - 1);
260	268	return -EBUSY;
261	269	}
262	270
263	271
264	272
265	273
266	274
...	...	@@ -265,25 +273,16 @@
265	273	goto error_release;
266	274	}
267	275
268		- new_client = &data->client;
269		- i2c_set_clientdata(new_client, data);
270		- new_client->addr = address;
	276	+ data->addr = res->start;
	277	+ data->name = "smsc47b397";
271	278	mutex_init(&data->lock);
272		- new_client->adapter = adapter;
273		- new_client->driver = &smsc47b397_driver;
274		- new_client->flags = 0;
275		-
276		- strlcpy(new_client->name, "smsc47b397", I2C_NAME_SIZE);
277		-
278	279	mutex_init(&data->update_lock);
	280	+ platform_set_drvdata(pdev, data);
279	281
280		- if ((err = i2c_attach_client(new_client)))
	282	+ if ((err = sysfs_create_group(&dev->kobj, &smsc47b397_group)))
281	283	goto error_free;
282	284
283		- if ((err = sysfs_create_group(&new_client->dev.kobj, &smsc47b397_group)))
284		- goto error_detach;
285		-
286		- data->class_dev = hwmon_device_register(&new_client->dev);
	285	+ data->class_dev = hwmon_device_register(dev);
287	286	if (IS_ERR(data->class_dev)) {
288	287	err = PTR_ERR(data->class_dev);
289	288	goto error_remove;
290	289
291	290
...	...	@@ -292,16 +291,53 @@
292	291	return 0;
293	292
294	293	error_remove:
295		- sysfs_remove_group(&new_client->dev.kobj, &smsc47b397_group);
296		-error_detach:
297		- i2c_detach_client(new_client);
	294	+ sysfs_remove_group(&dev->kobj, &smsc47b397_group);
298	295	error_free:
299	296	kfree(data);
300	297	error_release:
301		- release_region(address, SMSC_EXTENT);
	298	+ release_region(res->start, SMSC_EXTENT);
302	299	return err;
303	300	}
304	301
	302	+static int __init smsc47b397_device_add(unsigned short address)
	303	+{
	304	+ struct resource res = {
	305	+ .start = address,
	306	+ .end = address + SMSC_EXTENT - 1,
	307	+ .name = DRVNAME,
	308	+ .flags = IORESOURCE_IO,
	309	+ };
	310	+ int err;
	311	+
	312	+ pdev = platform_device_alloc(DRVNAME, address);
	313	+ if (!pdev) {
	314	+ err = -ENOMEM;
	315	+ printk(KERN_ERR DRVNAME ": Device allocation failed\n");
	316	+ goto exit;
	317	+ }
	318	+
	319	+ err = platform_device_add_resources(pdev, &res, 1);
	320	+ if (err) {
	321	+ printk(KERN_ERR DRVNAME ": Device resource addition failed "
	322	+ "(%d)\n", err);
	323	+ goto exit_device_put;
	324	+ }
	325	+
	326	+ err = platform_device_add(pdev);
	327	+ if (err) {
	328	+ printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
	329	+ err);
	330	+ goto exit_device_put;
	331	+ }
	332	+
	333	+ return 0;
	334	+
	335	+exit_device_put:
	336	+ platform_device_put(pdev);
	337	+exit:
	338	+ return err;
	339	+}
	340	+
305	341	static int __init smsc47b397_find(unsigned short *addr)
306	342	{
307	343	u8 id, rev;
...	...	@@ -320,7 +356,7 @@
320	356	*addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8)
321	357	\| superio_inb(SUPERIO_REG_BASE_LSB);
322	358
323		- printk(KERN_INFO "smsc47b397: found SMSC %s "
	359	+ printk(KERN_INFO DRVNAME ": found SMSC %s "
324	360	"(base address 0x%04x, revision %u)\n",
325	361	id == 0x81 ? "SCH5307-NS" : "LPC47B397-NC", *addr, rev);
326	362
327	363
328	364
...	...	@@ -330,17 +366,33 @@
330	366
331	367	static int __init smsc47b397_init(void)
332	368	{
	369	+ unsigned short address;
333	370	int ret;
334	371
335	372	if ((ret = smsc47b397_find(&address)))
336	373	return ret;
337	374
338		- return i2c_isa_add_driver(&smsc47b397_driver);
	375	+ ret = platform_driver_register(&smsc47b397_driver);
	376	+ if (ret)
	377	+ goto exit;
	378	+
	379	+ /* Sets global pdev as a side effect */
	380	+ ret = smsc47b397_device_add(address);
	381	+ if (ret)
	382	+ goto exit_driver;
	383	+
	384	+ return 0;
	385	+
	386	+exit_driver:
	387	+ platform_driver_unregister(&smsc47b397_driver);
	388	+exit:
	389	+ return ret;
339	390	}
340	391
341	392	static void __exit smsc47b397_exit(void)
342	393	{
343		- i2c_isa_del_driver(&smsc47b397_driver);
	394	+ platform_device_unregister(pdev);
	395	+ platform_driver_unregister(&smsc47b397_driver);
344	396	}
345	397
346	398	MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");