alter prototypes in airo.c platform.h
Subsystems (2)
PATCH 1/1 alter prototypes in airo.c platform.h
G'day list,
This one finishes up the altering prototypes (because they contain register) patches.
From http://linuxicc.sourceforge.net/
ICC complains about :Storage Class is not First
@ line 231 of platform.h &
@ lines 1078 & 1079 of airo.c
These are caused by the prototypes miss-naming the variables as "register". Which as it is a keyword is an error.
The patch below renames the variables in the prototypes to match the functions.
--- linux-2.6.16-rc3/drivers/isdn/hardware/eicon/platform.h.orig 2006-02-21 20:32:58.000000000 +1100
+++ linux-2.6.16-rc3/drivers/isdn/hardware/eicon/platform.h 2006-02-21 20:33:30.000000000 +1100
@@ -228,7 +228,7 @@ void PCIread (byte bus, byte func, int o
/*
** I/O Port utilities
*/
-int diva_os_register_io_port (void *adapter, int register, unsigned long port, +int diva_os_register_io_port (void *adapter, int on, unsigned long port,
unsigned long length, const char* name, int id);
/*
** I/O port access abstraction
drivers/net/wireless/airo.c renamed from drivers/net/wireless/airo.c.orig +2 -2
@@ -1075,8 +1075,8 @@ static const char version[] = "airo.c 0.struct airo_info ;static int get_dec_u16 (char *buffer,int *start,int limit ); -static void OUT4500 (struct airo_info *,u16 register,u16 value ); -static unsigned short IN4500 (struct airo_info *,u16 register ); +static void OUT4500 (struct airo_info *,u16 reg,u16 value ); +static unsigned short IN4500 (struct airo_info *,u16 reg );static u16 setup_card (struct airo_info *,u8 *mac,int lock);static int enable_MAC (struct airo_info *ai,Resp *rsp,int lock );static void disable_MAC (struct airo_info *ai,int lock);
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 12 lines · Darren Jenkins
G'day list,
This one finishes up the altering prototypes (because they contain register) patches.
Quoted 1 line
ICC complains about :Storage Class is not First
@ line 231 of
platform.h&
@ lines 1078 & 1079 ofairo.c
Quoted 7 lines
These are caused by the prototypes miss-naming the variables as "register". Which as it is a keyword is an error.
The patch below renames the variables in the prototypes to match the functions.
Signed-off-by Darren Jenkins <[email protected]>
Do I need to merge the airo hunk?
John
Signature · 2 lines
John W. Linville [email protected]
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 8 lines · John W. Linville
Quoted 2 lines · Darren Jenkins
Signed-off-by Darren Jenkins <[email protected]>Acked-by John W. Linville <[email protected]>Do I need to merge the airo hunk?
John
Do you mean the platform.h hunk ?
I would not expect you merge the platform.h part as I don't think it has anything to do with you. I did not cc the maintainer for that bit because I could not figure out who it was.
I included the two changes together to cut down on the number of emails with small changes. Perhaps that was a "bad idea" on my part.
Darren J.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 6 lines · Darren Jenkins
Quoted 5 lines · John W. Linville
Quoted 2 lines · Darren Jenkins
Signed-off-by Darren Jenkins <[email protected]>Acked-by John W. Linville <[email protected]>
Quoted 8 lines
Quoted 3 lines
Do I need to merge the airo hunk?
John
Do you mean the
platform.hhunk ?
I would not expect you merge theplatform.hpart as I don't think it has anything to do with you. I did not cc the maintainer for that bit because I could not figure out who it was.
Well, I guess I meant that it's OK for whoever merges the other part to merge the airo part as well. But, if they were expecting me to merge the airo part (or the whole thing), they need to let me know.
Quoted 2 lines
I included the two changes together to cut down on the number of emails with small changes. Perhaps that was a "bad idea" on my part.
You probably did the right thing, I just wanted to clarify who was merging what so that your patch didn't get dropped.
John
Signature · 2 lines
John W. Linville [email protected]
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors