From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754743AbcFPNvR (ORCPT ); Thu, 16 Jun 2016 09:51:17 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:54106 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754407AbcFPNvP (ORCPT ); Thu, 16 Jun 2016 09:51:15 -0400 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: Arnd Bergmann , Kalle Valo , Ondrej Zary , Johannes Berg , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/8] wireless: airo: rename 'register' variable Date: Thu, 16 Jun 2016 15:52:08 +0200 Message-Id: <20160616135245.3198419-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160616135020.3154461-1-arnd@arndb.de> References: <20160616135020.3154461-1-arnd@arndb.de> X-Provags-ID: V03:K0:5jUKJY/wBo6WKpiBEjpZrmE2CLwNZFefH8Flmy3qh4uEb2uBGk3 tzWOviTfDFAYWQEaNCiG8taKCfhNtFPLQZOY1Xkz6ksQWmsbraaJnIBcH55jtXk4vhYjEjB 2JmnvOvN2FnBu631ZQP+dOg8Tlh2p82PnZHc87GCM7mbcPj8lpN/pCDwvp67lqXCCgQKOWT TCKssn/L7SWsc9YHPAQKQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:pVgmBuUziQg=:LYWXPHkZvlxLsOi61mCKMM aQcxs7q8WKA6FubXcZlybxsgUz8j1G9AheAj3O/c8RjHqdRuwLTqwUxHIZLMNDnffsLuKub9Z F1VmOjfuj92nD41+9EClzsfHxq3MOSI4sj00vXdTLIkB+ajPkMxQcQwo1PDjyFf6886FjyJlm ZtZNvPoDd+8rFWYzarFfj8mzMAEwZW9IoKwYAlULAvfc98/lFcp/dmfggr73pwZl9/ANmfE1Y 942RnYeZtDmW4IOTNlXGJtTLH9gNoIwt6HjRDAllq5qP63FpiNwBEwtwGXDKFtJZFMC75+bVF 8rm0XfVHRY3BCkBpS9/CTnBuoSp2AcP5jZCuAHa6NZ+dlQvRK9PIWTnrZNOGNQFj+wq+KH7lr P+xRIoZv8aRnO0jnerXBFqPoTU4bHs6PseHhmVCpycead6SMvn++q7OJqAFjRxOs1LoXvSpdT OGSea0G+lDpBs6UKeO/Dt3PmoMy2Vl4oITUE5gATOpOQyLh0o8yOQadBlmDKBqBbBhx0MbsE7 5viYspEy+Zrdkj1l6ErZ5zizAlJd+D3cHyASgeBpj1KKT6+ZPTrl4ur2tj+Q474UItowURrrm nnl3nwqu2b9rA6f2+fDVnt8/Fe5i2nq0tP2rxKTFfTmoDOelp6IlXPVUSUIrdwd8YSJ2ZGXX+ gQKGjLr9nDpn2NhXUcAGkhBwH3Nc0/AXpyUC2CFk3nZT18dmv3NIF38UTw5tzqkFkOxg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org '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 --- drivers/net/wireless/cisco/airo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); -- 2.9.0