From patchwork Thu Jun 16 13:52:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102174 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp273422qgy; Thu, 16 Jun 2016 06:52:12 -0700 (PDT) X-Received: by 10.36.0.193 with SMTP id 184mr8254356ita.31.1466085131902; Thu, 16 Jun 2016 06:52:11 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z25si6137601pff.218.2016.06.16.06.52.11; Thu, 16 Jun 2016 06:52:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754756AbcFPNvz (ORCPT + 4 others); Thu, 16 Jun 2016 09:51:55 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:57861 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754312AbcFPNvw (ORCPT ); Thu, 16 Jun 2016 09:51:52 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0M5wgz-1bbxLc0jk1-00xrZg; Thu, 16 Jun 2016 15:51:37 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: Arnd Bergmann , Brett Rudley , Arend van Spriel , "Franky (Zhenhui) Lin" , Hante Meuleman , Kalle Valo , Johannes Berg , "David S. Miller" , linux-wireless@vger.kernel.org, brcm80211-dev-list@broadcom.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] wireless: brcmsmac: fix old-style declaration Date: Thu, 16 Jun 2016 15:52:09 +0200 Message-Id: <20160616135245.3198419-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160616135245.3198419-1-arnd@arndb.de> References: <20160616135020.3154461-1-arnd@arndb.de> <20160616135245.3198419-1-arnd@arndb.de> X-Provags-ID: V03:K0:5ThlEGWxKFBMMbFy//A/mgZYSSOZ4wwKVwsh9mB6YniYb81m5Uf SJBDhUTtMCTyAMvEIiEXw4QL+gvcFnFs/IELmW462gxOHXwaUpOWavWDtq3m2ic9xGnsDdE 8EJk9tRkvz7UwMzdjeSakaoP61iDIAl3SfEP9jqh0pqvQbdVT8CVd533gH5Kt22QHNl/9hL 4MeIP50x+7/mNjfPm4ODw== X-UI-Out-Filterresults: notjunk:1; V01:K0:nkNB5OORu0g=:aN80B7xR/QS68gmaQTEm5g S/1TPCW0RdPgAgyD2Cu6qrtYjjod182hPKWMPsXEb90GNFsL9c7YdUAmvRUaxhx8JnhHGxkd+ r1/ff72q3gfibbMaKWliHarCNHFWPlKFrqbhC0yukaLSnv2VlrUAE83S0AQe1v2trqIwo5qQK 04CszDijtiV1OiF5YzENFmsdXEAWTcOTxrU4xkGLk9ESiT11PGY9gCwXCo+cveJmPvv8kOLc1 yX1kUSYakWePKHWNhRHQIPOr3W1MWjfphfFW2KmvhbQQcfc33PI7BFqd0XGd5t3NNP4Rph8GU iD2yntQYpInxeN1SZVOOSSbDYD4F/5KJ0ho1m6bd3Cb2rX9o9zpNvFM8abXnH/PcHYz2gnSa8 cMUIKgfqHsnlGK8vBxbjUwd7083nbD+QBmIbC2Qzwdx6CrDQcc6Vp0HqcLOJeiPl7A4xyzGpe Zs61S0C92iCybZSVJpO3d09I/f2WagqGllMG6i6YSU0c8ly4XuYIIFRHwAETuLV88bFXvnQnV CLcIeU8c1e2/3YNAibATwKOdgPIsn36WE9sztiNGRWvNInCUz5HyTqWGjXQboU8/6WSOJBmOS KnSsxU/TS48uYYT2H1GL/TzxUAwhRXYeLBL3Ydj0NXupbhKnXeUyVRwCWpAVON/JRg32ndktW FaPrKd+lp15ANLK9L/ABK3InvKGH9ad9ddaJ8ypEIEx/MYkURa6p5N3ElxGv0yjICIVk= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Modern C standards expect the 'static' keyword to come first in a declaration, and we get a warning for this with "make W=1": drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c:3353:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] Signed-off-by: Arnd Bergmann --- drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c index e16ee60639f5..c2a938b59044 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c @@ -3349,8 +3349,8 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) dma_rxfill(wlc_hw->di[RX_FIFO]); } -void -static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) { +static void brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) +{ u32 macintmask; bool fastclk; struct brcms_c_info *wlc = wlc_hw->wlc; From patchwork Thu Jun 16 13:52:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102173 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp273502qgy; Thu, 16 Jun 2016 06:52:26 -0700 (PDT) X-Received: by 10.36.37.73 with SMTP id g70mr25097483itg.51.1466085146183; Thu, 16 Jun 2016 06:52:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z73si6141306pfi.134.2016.06.16.06.52.26; Thu, 16 Jun 2016 06:52:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754784AbcFPNwQ (ORCPT + 4 others); Thu, 16 Jun 2016 09:52:16 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:51968 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754751AbcFPNwN (ORCPT ); Thu, 16 Jun 2016 09:52:13 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0LxO7W-1bSIQC09Bi-016tql; Thu, 16 Jun 2016 15:52:10 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org, Thomas Sailer Cc: Arnd Bergmann , linux-hams@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] hamradio: baycom: fix old-style declaration Date: Thu, 16 Jun 2016 15:52:11 +0200 Message-Id: <20160616135245.3198419-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160616135245.3198419-1-arnd@arndb.de> References: <20160616135020.3154461-1-arnd@arndb.de> <20160616135245.3198419-1-arnd@arndb.de> X-Provags-ID: V03:K0:RdxtXzqdx2n3JQUXJJcOIMfryIi8umk9LPopDw3+rP3E49+FPEs s37QKZwLaFkUieY1tG3fRETT0hDdmDKWxu8ztzohI8RRWb77BKBIrrK5L/U2x7/1MRd3wYf khvFlMUkc6P4vD8+O4KUNqQMfe5ATg/+hkP4KfAWiEO34j17DDg9gVafy6ZM3nWoWaQsDT3 5iWBYllKfdFeOeK8F/HuA== X-UI-Out-Filterresults: notjunk:1; V01:K0:V8Xi7VQOEV0=:MuNGxntBxM8DND+6s+KJpx +PsR8zj6ClQfEeApN9UxSSU7PfAqThTmhDaGKcssTntU3+GK2MzOAaK9KKK5GsqiAuDWKyxyl i3KFEdS0w/Jss6w2zirNqMBaP69ZwMN7wElrLh0WF8sVUnk85+96v5OVwxdjA0RsYy0KCPTWM RQ+ph1o07xdFK6KqnLdEyOIWs68KO5VL0naCfMEWDlJGSBnez1LZPbto7utN6lCOIOixtgTgt K1licw68R6NsqmMMZOfL3QMas32T1Dj8odWOhwUJnOgSX8SnLeRwPn8Q+ChdQiGLi4Zbx7fdK X/6tsLW9X0EDVunb117cYg2A5PH2LOw7NU/lyrne0uIOLHSF7e5B6XzYTYVGEyUDQY2PtNfm5 Q+Y/mMrFakJJd12m6bkMkk56cOmAs3AdNtDIalxZlSItZhcSO3UO6tM1zhImK/IHriKZHNihv 8vBbepNLHCSMkw1dz9POJJr4dOrj4q6RBYYA8LUB1RidM/IA26Z5SfgkYjBkHkCV4y235YBbu vfB5BhPIhxOvuhRX/tik3+rmPSzCJt6E4D4D/kuoKVprqjdMM4pftvy/yhloSzcoOqk6Pvxf6 YiomLuwBg0hXqoxKz79wVTEHzlS3HuOanNsuiZBOYqXXA59K/4mL3gMoqtwdYykrijLfq2GEY oo6UU6vNHWHB660e89WUyPN5j4oiMj0PKjjtkD7JjNwvsDpON0KTPopJW6Paw2/u5GN0= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Modern C standards expect the '__inline__' keyword to come before the return type in a declaration, and we get a warning for this with "make W=1": drivers/net/hamradio/baycom_par.c:159:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] For consistency with other drivers, I'm changing '__inline__' to 'inline' at the same time. Signed-off-by: Arnd Bergmann --- drivers/net/hamradio/baycom_par.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index acb636963e90..072cddce9264 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c @@ -156,7 +156,7 @@ struct baycom_state { /* --------------------------------------------------------------------- */ -static void __inline__ baycom_int_freq(struct baycom_state *bc) +static inline void baycom_int_freq(struct baycom_state *bc) { #ifdef BAYCOM_DEBUG unsigned long cur_jiffies = jiffies; @@ -192,7 +192,7 @@ static void __inline__ baycom_int_freq(struct baycom_state *bc) /* --------------------------------------------------------------------- */ -static __inline__ void par96_tx(struct net_device *dev, struct baycom_state *bc) +static inline void par96_tx(struct net_device *dev, struct baycom_state *bc) { int i; unsigned int data = hdlcdrv_getbits(&bc->hdrv); @@ -216,7 +216,7 @@ static __inline__ void par96_tx(struct net_device *dev, struct baycom_state *bc) /* --------------------------------------------------------------------- */ -static __inline__ void par96_rx(struct net_device *dev, struct baycom_state *bc) +static inline void par96_rx(struct net_device *dev, struct baycom_state *bc) { int i; unsigned int data, mask, mask2, descx; From patchwork Thu Jun 16 13:52:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102171 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp273720qgy; Thu, 16 Jun 2016 06:52:52 -0700 (PDT) X-Received: by 10.107.173.196 with SMTP id m65mr8334089ioo.131.1466085172388; Thu, 16 Jun 2016 06:52:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ol5si37565704pab.73.2016.06.16.06.52.52; Thu, 16 Jun 2016 06:52:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754775AbcFPNwh (ORCPT + 4 others); Thu, 16 Jun 2016 09:52:37 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:59959 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754312AbcFPNwf (ORCPT ); Thu, 16 Jun 2016 09:52:35 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0LymEJ-1bRTTR2MFD-0165ZW; Thu, 16 Jun 2016 15:52:26 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org, Karsten Keil Cc: Arnd Bergmann , Armin Schindler , linux-kernel@vger.kernel.org Subject: [PATCH 5/8] isdn: eicon: fix old-style declarations Date: Thu, 16 Jun 2016 15:52:12 +0200 Message-Id: <20160616135245.3198419-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160616135245.3198419-1-arnd@arndb.de> References: <20160616135020.3154461-1-arnd@arndb.de> <20160616135245.3198419-1-arnd@arndb.de> X-Provags-ID: V03:K0:9m3bXhQolTner1fTZwfKaqCxnCyysjHRN93PLaXxdHE6hn4Mn3F 0JcuDfgBfgu/rjdWFnzeDlGBwLJbSs8bWYDS80fm6ZMLRYFVLZK2WNbzCtqKI/9FVOlbthL k/VNU7Zk8sQkNnwzgbHb6jF4jmzcohqhzFiiz+BiEf5Sslsz3ym+7uO6Gcd94vU5yH3rdGd 4HsawN3ThAEtR/OaJu1rg== X-UI-Out-Filterresults: notjunk:1; V01:K0:sUDj6Y1WLDo=:SHW+3PdE3nlJGfR0yAOt/F EOQL8BjPOiPyFM95pamJrWqXL3hBzFAjC9ScFJx8PoaGn/k9A/Q9m/EyKiX9a1jaY8jNGTBmn ifxRzntBQA5lZkonigXbUs+mHp22Ab2MBAG8565LPCZWoXJPR1+oHuzczxzqROgTOizR/8Q78 uDLqwXMVgUfvwwu2avJ/GtUKdwcikbToDrKp1cOgq9btV4oxwKs8pFfQ8JuECwFl/Q7rea8ej Apt1QmTrN5ZontvxA3yz5QtUmRZQrqEHSFtAd24H6p/VEOhKQazDKsAnjsuFSBp/TbeAGCqo5 VkzDVEBwWFbMYhPshzbOofoBjx0H2x7CxqRgaP4mqiysbJXaCW9Iye4hYsmW0nKJW9VCDv/tX OgjkYr/kKQH2+61mg1lvJ0fGQCkywgXW/In5bWJwT/NL9DUmpju3ySjTxegDKgr3DqF3jYVO1 VLYgpCVLDSHWCPmG5Utua6jUWaN4TQOr2pj5pUa/gKy7uXhb349ec2avRhly1rdLXsRmmMxh5 W5l4Dxghdu6N3T760iU95c005DNyv4LSBN8VID4O3JVhR8FSFLUM3OObSeysUzveD+7J85PxF 43xp73q/AIXCqAtZhuPZhzYleUWINbCJYNSpSGrjmjD78KeZ56MAbvBWUvhtXtd6/6DHJArMn sNrp+jNeC2uZI4DPMlBT+YSWVdqpvpryX5KxYMJ0WeLHanAgSrsVTnCpVnOE3U/UDWlk= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Modern C standards expect the '__inline__' keyword to come before the return type in a declaration, and we get many warnings for this with "make W=1" because the eicon driver has this in a header file: eicon/divasmain.c:448:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] eicon/divasmain.c:453:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] eicon/divasmain.c:458:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] eicon/divasmain.c:463:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] eicon/divasmain.c:468:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] eicon/divasmain.c:473:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] eicon/platform.h:274:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] eicon/platform.h:280:1: error: '__inline__' is not at beginning of declaration [-Werror=old-style-declaration] A similar warning gets printed for the diva_os_register_io_port() declaration, because 'register' is interpreted as a keyword instead of a variable name: In file included from eicon/diva_didd.c:21:0: eicon/platform.h:206:1: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration] Signed-off-by: Arnd Bergmann --- drivers/isdn/hardware/eicon/divasmain.c | 12 ++++++------ drivers/isdn/hardware/eicon/platform.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) -- 2.9.0 diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index a2e0ed6c9a4d..32f34511c416 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c @@ -445,32 +445,32 @@ void divasa_unmap_pci_bar(void __iomem *bar) /********************************************************* ** I/O port access *********************************************************/ -byte __inline__ inpp(void __iomem *addr) +inline byte inpp(void __iomem *addr) { return (inb((unsigned long) addr)); } -word __inline__ inppw(void __iomem *addr) +inline word inppw(void __iomem *addr) { return (inw((unsigned long) addr)); } -void __inline__ inppw_buffer(void __iomem *addr, void *P, int length) +inline void inppw_buffer(void __iomem *addr, void *P, int length) { insw((unsigned long) addr, (word *) P, length >> 1); } -void __inline__ outppw_buffer(void __iomem *addr, void *P, int length) +inline void outppw_buffer(void __iomem *addr, void *P, int length) { outsw((unsigned long) addr, (word *) P, length >> 1); } -void __inline__ outppw(void __iomem *addr, word w) +inline void outppw(void __iomem *addr, word w) { outw(w, (unsigned long) addr); } -void __inline__ outpp(void __iomem *addr, word p) +inline void outpp(void __iomem *addr, word p) { outb(p, (unsigned long) addr); } diff --git a/drivers/isdn/hardware/eicon/platform.h b/drivers/isdn/hardware/eicon/platform.h index b2edb7590dda..62e2073c3690 100644 --- a/drivers/isdn/hardware/eicon/platform.h +++ b/drivers/isdn/hardware/eicon/platform.h @@ -203,7 +203,7 @@ void PCIread(byte bus, byte func, int offset, void *data, int length, void *pci_ /* ** 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 reg, unsigned long port, unsigned long length, const char *name, int id); /* ** I/O port access abstraction @@ -271,13 +271,13 @@ void diva_os_get_time(dword *sec, dword *usec); ** atomic operation, fake because we use threads */ typedef int diva_os_atomic_t; -static diva_os_atomic_t __inline__ +static inline diva_os_atomic_t diva_os_atomic_increment(diva_os_atomic_t *pv) { *pv += 1; return (*pv); } -static diva_os_atomic_t __inline__ +static inline diva_os_atomic_t diva_os_atomic_decrement(diva_os_atomic_t *pv) { *pv -= 1;