From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A275FC43219 for ; Sat, 26 Mar 2022 17:01:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233905AbiCZRCg (ORCPT ); Sat, 26 Mar 2022 13:02:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233883AbiCZRCc (ORCPT ); Sat, 26 Mar 2022 13:02:32 -0400 X-Greylist: delayed 72 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sat, 26 Mar 2022 10:00:51 PDT Received: from stuerz.xyz (unknown [45.77.206.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E66812658B; Sat, 26 Mar 2022 10:00:51 -0700 (PDT) Received: by stuerz.xyz (Postfix, from userid 114) id C0AB5FBBF5; Sat, 26 Mar 2022 17:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=stuerz.xyz; s=mail; t=1648314050; bh=n+yVi6iAEC+yUDGtAiTeBRB6isAkXDN31MWea5bro/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dHgnS/DFKqe/aLEuORFbAT1jqI3IELdNbkgLSitQxh5vtG17J9IyfPUMcK78fAvQ5 4vi5rs9z50d4x9NxL9yo+dxbW0E4F8gWCS1RXnKbBnSnVzmWcF09p+t3KfQsSbYqj8 vf77nt3+Hy2V/4BFujPbnVyp22kBWzfEqmkWYHWtp7suHB4tIRpixBkOxUfZK3pKNp 3if+wFMgJVKLB5l18B+xlQ2PvSRrYK7JUUXw9hYRRqJGog9nCDukipnzcB8JQva2ud vU6yoXClBVmfpyOauBwqJfZDCjEjpJkA5gAhLI949yZTMxVlrJcT6dogEykTG+uGM5 yoKFvnlJ73LuA== Received: from benni-fedora.. (unknown [IPv6:2a02:8109:a100:1a48:ff0:ef2f:d4da:17d8]) by stuerz.xyz (Postfix) with ESMTPSA id 252BCFBB90; Sat, 26 Mar 2022 17:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=stuerz.xyz; s=mail; t=1648314046; bh=n+yVi6iAEC+yUDGtAiTeBRB6isAkXDN31MWea5bro/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i4ESBfHhBQWz8zVimJokPBUGs2luFLOMsiMFTqCcllthbc5FZeZbTFNW42j54RQyv oQzXJscmNfNsalEUNrLmkZZZXwdcucGRrIVZf8nBBRuxbGGBwSMRkigSoqaRA05Wlk uLDJDV/TcG97HIzxIFe9Nn3Fd2839k22PbjzE7HroPrKFG8M13lFCKnBzDHbYBbAMB 0SC6cK9MMn9aXFAq0LwFSjsCK8mZHkghbvOLq3o0kyDY63E5IXFORegEUFguMfMTkL 8s53a4Ig2fAPovHMcwMRDmIptgnTjXjHVQ3eE8Ujh78FcUVpv49dQfaBr1tXPA1/ue FLNxHoXHOsikQ== From: =?UTF-8?q?Benjamin=20St=C3=BCrz?= To: andrew@lunn.ch Cc: sebastian.hesselbarth@gmail.com, gregory.clement@bootlin.com, linux@armlinux.org.uk, linux@simtec.co.uk, krzk@kernel.org, alim.akhtar@samsung.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, robert.moore@intel.com, rafael.j.wysocki@intel.com, lenb@kernel.org, 3chas3@gmail.com, laforge@gnumonks.org, arnd@arndb.de, gregkh@linuxfoundation.org, mchehab@kernel.org, tony.luck@intel.com, james.morse@arm.com, rric@kernel.org, linus.walleij@linaro.org, brgl@bgdev.pl, mike.marciniszyn@cornelisnetworks.com, dennis.dalessandro@cornelisnetworks.com, jgg@ziepe.ca, pali@kernel.org, dmitry.torokhov@gmail.com, isdn@linux-pingi.de, benh@kernel.crashing.org, fbarrat@linux.ibm.com, ajd@linux.ibm.com, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, nico@fluxnic.net, loic.poulain@linaro.org, kvalo@kernel.org, pkshih@realtek.com, bhelgaas@google.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-edac@vger.kernel.org, linux-gpio@vger.kernel.org, linux-rdma@vger.kernel.org, linux-input@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-media@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, linux-pci@vger.kernel.org, =?UTF-8?q?Benjamin=20St=C3=BCrz?= Subject: [PATCH 13/22] capi: Replace comments with C99 initializers Date: Sat, 26 Mar 2022 17:59:00 +0100 Message-Id: <20220326165909.506926-13-benni@stuerz.xyz> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220326165909.506926-1-benni@stuerz.xyz> References: <20220326165909.506926-1-benni@stuerz.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This replaces comments with C99's designated initializers because the kernel supports them now. Signed-off-by: Benjamin Stürz --- drivers/isdn/capi/capiutil.c | 240 ++++++++++++++--------------------- 1 file changed, 96 insertions(+), 144 deletions(-) diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c index d7ae42edc4a8..1213f5cb976e 100644 --- a/drivers/isdn/capi/capiutil.c +++ b/drivers/isdn/capi/capiutil.c @@ -38,102 +38,54 @@ typedef struct { static _cdef cdef[] = { - /*00 */ - {_CEND}, - /*01 */ - {_CEND}, - /*02 */ - {_CEND}, - /*03 */ - {_CDWORD, offsetof(_cmsg, adr.adrController)}, - /*04 */ - {_CMSTRUCT, offsetof(_cmsg, AdditionalInfo)}, - /*05 */ - {_CSTRUCT, offsetof(_cmsg, B1configuration)}, - /*06 */ - {_CWORD, offsetof(_cmsg, B1protocol)}, - /*07 */ - {_CSTRUCT, offsetof(_cmsg, B2configuration)}, - /*08 */ - {_CWORD, offsetof(_cmsg, B2protocol)}, - /*09 */ - {_CSTRUCT, offsetof(_cmsg, B3configuration)}, - /*0a */ - {_CWORD, offsetof(_cmsg, B3protocol)}, - /*0b */ - {_CSTRUCT, offsetof(_cmsg, BC)}, - /*0c */ - {_CSTRUCT, offsetof(_cmsg, BChannelinformation)}, - /*0d */ - {_CMSTRUCT, offsetof(_cmsg, BProtocol)}, - /*0e */ - {_CSTRUCT, offsetof(_cmsg, CalledPartyNumber)}, - /*0f */ - {_CSTRUCT, offsetof(_cmsg, CalledPartySubaddress)}, - /*10 */ - {_CSTRUCT, offsetof(_cmsg, CallingPartyNumber)}, - /*11 */ - {_CSTRUCT, offsetof(_cmsg, CallingPartySubaddress)}, - /*12 */ - {_CDWORD, offsetof(_cmsg, CIPmask)}, - /*13 */ - {_CDWORD, offsetof(_cmsg, CIPmask2)}, - /*14 */ - {_CWORD, offsetof(_cmsg, CIPValue)}, - /*15 */ - {_CDWORD, offsetof(_cmsg, Class)}, - /*16 */ - {_CSTRUCT, offsetof(_cmsg, ConnectedNumber)}, - /*17 */ - {_CSTRUCT, offsetof(_cmsg, ConnectedSubaddress)}, - /*18 */ - {_CDWORD, offsetof(_cmsg, Data)}, - /*19 */ - {_CWORD, offsetof(_cmsg, DataHandle)}, - /*1a */ - {_CWORD, offsetof(_cmsg, DataLength)}, - /*1b */ - {_CSTRUCT, offsetof(_cmsg, FacilityConfirmationParameter)}, - /*1c */ - {_CSTRUCT, offsetof(_cmsg, Facilitydataarray)}, - /*1d */ - {_CSTRUCT, offsetof(_cmsg, FacilityIndicationParameter)}, - /*1e */ - {_CSTRUCT, offsetof(_cmsg, FacilityRequestParameter)}, - /*1f */ - {_CWORD, offsetof(_cmsg, FacilitySelector)}, - /*20 */ - {_CWORD, offsetof(_cmsg, Flags)}, - /*21 */ - {_CDWORD, offsetof(_cmsg, Function)}, - /*22 */ - {_CSTRUCT, offsetof(_cmsg, HLC)}, - /*23 */ - {_CWORD, offsetof(_cmsg, Info)}, - /*24 */ - {_CSTRUCT, offsetof(_cmsg, InfoElement)}, - /*25 */ - {_CDWORD, offsetof(_cmsg, InfoMask)}, - /*26 */ - {_CWORD, offsetof(_cmsg, InfoNumber)}, - /*27 */ - {_CSTRUCT, offsetof(_cmsg, Keypadfacility)}, - /*28 */ - {_CSTRUCT, offsetof(_cmsg, LLC)}, - /*29 */ - {_CSTRUCT, offsetof(_cmsg, ManuData)}, - /*2a */ - {_CDWORD, offsetof(_cmsg, ManuID)}, - /*2b */ - {_CSTRUCT, offsetof(_cmsg, NCPI)}, - /*2c */ - {_CWORD, offsetof(_cmsg, Reason)}, - /*2d */ - {_CWORD, offsetof(_cmsg, Reason_B3)}, - /*2e */ - {_CWORD, offsetof(_cmsg, Reject)}, - /*2f */ - {_CSTRUCT, offsetof(_cmsg, Useruserdata)} + [0x00] = {_CEND}, + [0x01] = {_CEND}, + [0x02] = {_CEND}, + [0x03] = {_CDWORD, offsetof(_cmsg, adr.adrController)}, + [0x04] = {_CMSTRUCT, offsetof(_cmsg, AdditionalInfo)}, + [0x05] = {_CSTRUCT, offsetof(_cmsg, B1configuration)}, + [0x06] = {_CWORD, offsetof(_cmsg, B1protocol)}, + [0x07] = {_CSTRUCT, offsetof(_cmsg, B2configuration)}, + [0x08] = {_CWORD, offsetof(_cmsg, B2protocol)}, + [0x09] = {_CSTRUCT, offsetof(_cmsg, B3configuration)}, + [0x0a] = {_CWORD, offsetof(_cmsg, B3protocol)}, + [0x0b] = {_CSTRUCT, offsetof(_cmsg, BC)}, + [0x0c] = {_CSTRUCT, offsetof(_cmsg, BChannelinformation)}, + [0x0d] = {_CMSTRUCT, offsetof(_cmsg, BProtocol)}, + [0x0e] = {_CSTRUCT, offsetof(_cmsg, CalledPartyNumber)}, + [0x0f] = {_CSTRUCT, offsetof(_cmsg, CalledPartySubaddress)}, + [0x10] = {_CSTRUCT, offsetof(_cmsg, CallingPartyNumber)}, + [0x11] = {_CSTRUCT, offsetof(_cmsg, CallingPartySubaddress)}, + [0x12] = {_CDWORD, offsetof(_cmsg, CIPmask)}, + [0x13] = {_CDWORD, offsetof(_cmsg, CIPmask2)}, + [0x14] = {_CWORD, offsetof(_cmsg, CIPValue)}, + [0x15] = {_CDWORD, offsetof(_cmsg, Class)}, + [0x16] = {_CSTRUCT, offsetof(_cmsg, ConnectedNumber)}, + [0x17] = {_CSTRUCT, offsetof(_cmsg, ConnectedSubaddress)}, + [0x18] = {_CDWORD, offsetof(_cmsg, Data)}, + [0x19] = {_CWORD, offsetof(_cmsg, DataHandle)}, + [0x1a] = {_CWORD, offsetof(_cmsg, DataLength)}, + [0x1b] = {_CSTRUCT, offsetof(_cmsg, FacilityConfirmationParameter)}, + [0x1c] = {_CSTRUCT, offsetof(_cmsg, Facilitydataarray)}, + [0x1d] = {_CSTRUCT, offsetof(_cmsg, FacilityIndicationParameter)}, + [0x1e] = {_CSTRUCT, offsetof(_cmsg, FacilityRequestParameter)}, + [0x1f] = {_CWORD, offsetof(_cmsg, FacilitySelector)}, + [0x20] = {_CWORD, offsetof(_cmsg, Flags)}, + [0x21] = {_CDWORD, offsetof(_cmsg, Function)}, + [0x22] = {_CSTRUCT, offsetof(_cmsg, HLC)}, + [0x23] = {_CWORD, offsetof(_cmsg, Info)}, + [0x24] = {_CSTRUCT, offsetof(_cmsg, InfoElement)}, + [0x25] = {_CDWORD, offsetof(_cmsg, InfoMask)}, + [0x26] = {_CWORD, offsetof(_cmsg, InfoNumber)}, + [0x27] = {_CSTRUCT, offsetof(_cmsg, Keypadfacility)}, + [0x28] = {_CSTRUCT, offsetof(_cmsg, LLC)}, + [0x29] = {_CSTRUCT, offsetof(_cmsg, ManuData)}, + [0x2a] = {_CDWORD, offsetof(_cmsg, ManuID)}, + [0x2b] = {_CSTRUCT, offsetof(_cmsg, NCPI)}, + [0x2c] = {_CWORD, offsetof(_cmsg, Reason)}, + [0x2d] = {_CWORD, offsetof(_cmsg, Reason_B3)}, + [0x2e] = {_CWORD, offsetof(_cmsg, Reject)}, + [0x2f] = {_CSTRUCT, offsetof(_cmsg, Useruserdata)} }; static unsigned char *cpars[] = @@ -329,54 +281,54 @@ char *capi_cmd2str(u8 cmd, u8 subcmd) static char *pnames[] = { - /*00 */ NULL, - /*01 */ NULL, - /*02 */ NULL, - /*03 */ "Controller/PLCI/NCCI", - /*04 */ "AdditionalInfo", - /*05 */ "B1configuration", - /*06 */ "B1protocol", - /*07 */ "B2configuration", - /*08 */ "B2protocol", - /*09 */ "B3configuration", - /*0a */ "B3protocol", - /*0b */ "BC", - /*0c */ "BChannelinformation", - /*0d */ "BProtocol", - /*0e */ "CalledPartyNumber", - /*0f */ "CalledPartySubaddress", - /*10 */ "CallingPartyNumber", - /*11 */ "CallingPartySubaddress", - /*12 */ "CIPmask", - /*13 */ "CIPmask2", - /*14 */ "CIPValue", - /*15 */ "Class", - /*16 */ "ConnectedNumber", - /*17 */ "ConnectedSubaddress", - /*18 */ "Data32", - /*19 */ "DataHandle", - /*1a */ "DataLength", - /*1b */ "FacilityConfirmationParameter", - /*1c */ "Facilitydataarray", - /*1d */ "FacilityIndicationParameter", - /*1e */ "FacilityRequestParameter", - /*1f */ "FacilitySelector", - /*20 */ "Flags", - /*21 */ "Function", - /*22 */ "HLC", - /*23 */ "Info", - /*24 */ "InfoElement", - /*25 */ "InfoMask", - /*26 */ "InfoNumber", - /*27 */ "Keypadfacility", - /*28 */ "LLC", - /*29 */ "ManuData", - /*2a */ "ManuID", - /*2b */ "NCPI", - /*2c */ "Reason", - /*2d */ "Reason_B3", - /*2e */ "Reject", - /*2f */ "Useruserdata" + [0x00] = NULL, + [0x01] = NULL, + [0x02] = NULL, + [0x03] = "Controller/PLCI/NCCI", + [0x04] = "AdditionalInfo", + [0x05] = "B1configuration", + [0x06] = "B1protocol", + [0x07] = "B2configuration", + [0x08] = "B2protocol", + [0x09] = "B3configuration", + [0x0a] = "B3protocol", + [0x0b] = "BC", + [0x0c] = "BChannelinformation", + [0x0d] = "BProtocol", + [0x0e] = "CalledPartyNumber", + [0x0f] = "CalledPartySubaddress", + [0x10] = "CallingPartyNumber", + [0x11] = "CallingPartySubaddress", + [0x12] = "CIPmask", + [0x13] = "CIPmask2", + [0x14] = "CIPValue", + [0x15] = "Class", + [0x16] = "ConnectedNumber", + [0x17] = "ConnectedSubaddress", + [0x18] = "Data32", + [0x19] = "DataHandle", + [0x1a] = "DataLength", + [0x1b] = "FacilityConfirmationParameter", + [0x1c] = "Facilitydataarray", + [0x1d] = "FacilityIndicationParameter", + [0x1e] = "FacilityRequestParameter", + [0x1f] = "FacilitySelector", + [0x20] = "Flags", + [0x21] = "Function", + [0x22] = "HLC", + [0x23] = "Info", + [0x24] = "InfoElement", + [0x25] = "InfoMask", + [0x26] = "InfoNumber", + [0x27] = "Keypadfacility", + [0x28] = "LLC", + [0x29] = "ManuData", + [0x2a] = "ManuID", + [0x2b] = "NCPI", + [0x2c] = "Reason", + [0x2d] = "Reason_B3", + [0x2e] = "Reject", + [0x2f] = "Useruserdata" }; #include -- 2.35.1