[patch] sensors/w83781d.c creates useless sysfs entries

[patch] sensors/w83781d.c creates useless sysfs entries

[Jindrich Makovicka]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

Hello,

here is a trivial fix for Winbond sensor driver, which currently creates 
useless entries in sys/bus/i2c due to missing braces after if statements 
- author probably forgot about the macro expansion.

Regards,
-- 
Jindrich Makovicka

[-- Attachment #2: w83781d.c.patch --]
[-- Type: text/plain, Size: 1333 bytes --]

--- w83781d.c.orig	2003-10-02 08:17:20.000000000 +0200
+++ w83781d.c	2003-10-11 14:45:59.000000000 +0200
@@ -1347,8 +1347,10 @@
 	}
 
 	device_create_file_in(new_client, 0);
-	if (kind != w83783s && kind != w83697hf)
+	if (kind != w83783s && kind != w83697hf) {
 		device_create_file_in(new_client, 1);
+	}
+	
 	device_create_file_in(new_client, 2);
 	device_create_file_in(new_client, 3);
 	device_create_file_in(new_client, 4);
@@ -1361,25 +1363,30 @@
 
 	device_create_file_fan(new_client, 1);
 	device_create_file_fan(new_client, 2);
-	if (kind != w83697hf)
+	if (kind != w83697hf) {
 		device_create_file_fan(new_client, 3);
+	}
 
 	device_create_file_temp(new_client, 1);
 	device_create_file_temp(new_client, 2);
-	if (kind != w83783s && kind != w83697hf)
+	if (kind != w83783s && kind != w83697hf) {
 		device_create_file_temp(new_client, 3);
-
-	if (kind != w83697hf)
+	}
+	
+	if (kind != w83697hf) {
 		device_create_file_vid(new_client);
-
-	if (kind != w83697hf)
+	}
+	
+	if (kind != w83697hf) {
 		device_create_file_vrm(new_client);
-
+	}
+	
 	device_create_file_fan_div(new_client, 1);
 	device_create_file_fan_div(new_client, 2);
-	if (kind != w83697hf)
+	if (kind != w83697hf) {
 		device_create_file_fan_div(new_client, 3);
-
+	}
+	
 	device_create_file_alarms(new_client);
 
 	device_create_file_beep(new_client);

Re: [patch] sensors/w83781d.c creates useless sysfs entries

[Kronos]

Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz> ha scritto:
> Hello,
> 
> here is a trivial fix for Winbond sensor driver, which currently creates 
> useless entries in sys/bus/i2c due to missing braces after if statements 
> - author probably forgot about the macro expansion.

IMHO it's better to fix the macro:

--- a/drivers/i2c/chips/w83781d.c	Sun Sep 28 17:47:38 2003
+++ b/drivers/i2c/chips/w83781d.c	Sat Oct 11 18:31:04 2003
@@ -422,9 +422,11 @@
 sysfs_in_offsets(8);
 
 #define device_create_file_in(client, offset) \
+do { \
 device_create_file(&client->dev, &dev_attr_in_input##offset); \
 device_create_file(&client->dev, &dev_attr_in_min##offset); \
-device_create_file(&client->dev, &dev_attr_in_max##offset);
+device_create_file(&client->dev, &dev_attr_in_max##offset); \
+} while (0);
 
 #define show_fan_reg(reg) \
 static ssize_t show_##reg (struct device *dev, char *buf, int nr) \


Luca
-- 
Reply-To: kronos@kronoz.cjb.net
Home: http://kronoz.cjb.net
Windows NT: Designed for the Internet. The Internet: Designed for Unix.

Re: [patch] sensors/w83781d.c creates useless sysfs entries

[Greg KH]

On Sat, Oct 11, 2003 at 06:32:44PM +0200, Kronos wrote:
> Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz> ha scritto:
> > Hello,
> > 
> > here is a trivial fix for Winbond sensor driver, which currently creates 
> > useless entries in sys/bus/i2c due to missing braces after if statements 
> > - author probably forgot about the macro expansion.
> 
> IMHO it's better to fix the macro:

Thanks, I've applied this version.

greg k-h