Skip to contentSkip to conversation

Alter prototypes in adm1026.c

PATCH Applied Darren Jenkins\ 4 participants 4 messages Feb 17, 2006 – Feb 21, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Alter prototypes in adm1026.c

G'day list

from http://linuxicc.sourceforge.net/

ICC complains about : Storage Class is not First
@ line 301 & 302 of adm1026.c

It appears that the variable in the prototype is named register which confuses ICC, it is called (more sensibly) reg in the actual functions. This is confusing (as register is a keyword) so the patch below re-names the variable in the prototype to match the actual functions. (reg).

drivers/hwmon/adm1026.c renamed from drivers/hwmon/adm1026.c.orig +2 -2
@@ -298,8 +298,8 @@ static int adm1026_attach_adapter(struct
 static int adm1026_detect(struct i2c_adapter *adapter, int address,
 	int kind);
 static int adm1026_detach_client(struct i2c_client *client);
-static int adm1026_read_value(struct i2c_client *client, u8 register);
-static int adm1026_write_value(struct i2c_client *client, u8 register,
+static int adm1026_read_value(struct i2c_client *client, u8 reg);
+static int adm1026_write_value(struct i2c_client *client, u8 reg,
 	int value); 
 static void adm1026_print_gpio(struct i2c_client *client);
 static void adm1026_fixup_gpio(struct i2c_client *client); 

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw
Quoted 8 lines · Darren Jenkins

from http://linuxicc.sourceforge.net/

ICC complains about : Storage Class is not First
@ line 301 & 302 of adm1026.c

It appears that the variable in the prototype is named register which confuses ICC, it is called (more sensibly) reg in the actual functions. This is confusing (as register is a keyword)

Applied. Standard more or less says, if pp-identifier can be converted to identifier or keyword, it's converted to keyword. So, we have "u8 [keyword]" oops...

drivers/hwmon/adm1026.c static int adm1026_attach_adapter(struct · line 303

Quoted 11 lines

so the patch below re-names
the variable in the prototype to match the actual functions. (reg).

drivers/hwmon/adm1026.c renamed from drivers/hwmon/adm1026.c.orig +2 -2
 
-static int adm1026_read_value(struct i2c_client *client, u8 register);
-static int adm1026_write_value(struct i2c_client *client, u8 register,
+static int adm1026_read_value(struct i2c_client *client, u8 reg);
+static int adm1026_write_value(struct i2c_client *client, u8 reg,
 	int value);

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#2 lore raw
In reply to Darren Jenkins\

Hi Alexey,

Quoted 10 lines · Alexey Dobriyan
Quoted 6 lines

ICC complains about : Storage Class is not First
@ line 301 & 302 of adm1026.c

It appears that the variable in the prototype is named register which confuses ICC, it is called (more sensibly) reg in the actual functions. This is confusing (as register is a keyword)

Applied. Standard more or less says, if pp-identifier can be converted to identifier or keyword, it's converted to keyword. So, we have "u8 [keyword]" oops...

Applied? To what, please? As the maintainer of the hwmon subsystem, I took these patches already.

Thanks,
--
Jean Delvare

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#3 lore raw
In reply to Darren Jenkins\
Quoted 11 lines · Jean Delvare

Hi Alexey,

Quoted 7 lines · Alexey Dobriyan
Quoted 6 lines

ICC complains about : Storage Class is not First
@ line 301 & 302 of adm1026.c

It appears that the variable in the prototype is named register which confuses ICC, it is called (more sensibly) reg in the actual functions. This is confusing (as register is a keyword)

Quoted 6 lines
Quoted 3 lines

Applied. Standard more or less says, if pp-identifier can be converted to identifier or keyword, it's converted to keyword. So, we have "u8 [keyword]" oops...

Applied? To what, please? As the maintainer of the hwmon subsystem, I took these patches already.

I'm pretty sure he meant they were applied to the -kj tree. When Alexey next merges against mainline, he'll see your patches have been pushed up (hopefully) and it will resolve itself. Or he might drop them now, since you've said you have merged them.

Thanks,
Nish

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors