| Message ID | 20160616135245.3198419-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 88e97c32068ff365970c0958771b9dce131c3590 |
| Delegated to: | Kalle Valo |
| Headers | show |
Arnd Bergmann <arnd@arndb.de> wrote: > 'register' is a keyword in C and cannot be used in place of a > variable name, as shown by this -Wextra warning: > > drivers/net/wireless/cisco/airo.c:1105:29: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration] > > This replaces the 'register' keyword with a 'reg' identifier in > the declaration, which matches the definition and has the intended > meaning. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks, 3 patches applied to wireless-drivers-next.git: 88e97c32068f wireless: airo: rename 'register' variable 2a063835ce7c wireless: brcmsmac: fix old-style declaration 6f07e0f12a57 wireless: ipw2200: fix old-style declaration
diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c index b6c9d5feef1f..6bdb6f6bdfe8 100644 --- a/drivers/net/wireless/cisco/airo.c +++ b/drivers/net/wireless/cisco/airo.c @@ -1102,8 +1102,8 @@ static const char version[] = "airo.c 0.6 (Ben Reed & Javier Achirica)"; 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, int lock); static void disable_MAC(struct airo_info *ai, int lock);
'register' is a keyword in C and cannot be used in place of a variable name, as shown by this -Wextra warning: drivers/net/wireless/cisco/airo.c:1105:29: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration] This replaces the 'register' keyword with a 'reg' identifier in the declaration, which matches the definition and has the intended meaning. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/wireless/cisco/airo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)