summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/cisco
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-06-16 15:52:08 +0200
committerKalle Valo <kvalo@codeaurora.org>2016-06-29 18:56:20 +0300
commit88e97c32068ff365970c0958771b9dce131c3590 (patch)
tree194e729e49b903348aeabad4f821a03fb289c7a4 /drivers/net/wireless/cisco
parent7311ea85007954e14cb7f5c60ce969f7a4f618c6 (diff)
downloadtalos-obmc-linux-88e97c32068ff365970c0958771b9dce131c3590.tar.gz
talos-obmc-linux-88e97c32068ff365970c0958771b9dce131c3590.zip
wireless: airo: rename 'register' variable
'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> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/cisco')
-rw-r--r--drivers/net/wireless/cisco/airo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c
index ca3cd2102bd6..69b826d229c5 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);
OpenPOWER on IntegriCloud