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;