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 smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 604B7CD484D for ; Mon, 11 May 2026 17:33:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3B0A080DB3; Mon, 11 May 2026 17:33:26 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 2T9tD1yuWIQf; Mon, 11 May 2026 17:33:24 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 88D6B80D9E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1778520804; bh=Sf1/UiR9Ps90mVJSmmKtta/sIyGJtin4xUFGhet+TYw=; h=Date:From:To:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=KlufucSmkzZK3Vw3rdL1Ceo0fq5oMK3ihCjnhYUJ5tuaxNncDQajoRQnFGrguAzBE 3RAYL3I46AqD7vLWrvTdJoB2SztkQB22vKvmay3985g6+h0gC5CWx1IrSI3qxXV0Nm IvqmvAXUU6gBBk+ohKv/3oCc6RLcOT9FFP8+vYRWMUXRH8axJ7w2aYbY5xm/NLb3cv SlVEr9RWruBaVfTuddy4Qde8Yt0uPU1wQkXwx1zCeg1qMzer5SN6TGQvt+kQcWpO1V A3Mq+y8LPfuy4Z/QRacin6Wr61SpZ9pyFtkSvn2Bm6sxsSjiOptNdo62VZQ86QODLg 78Hd8rqzCfqyw== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id 88D6B80D9E; Mon, 11 May 2026 17:33:24 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists1.osuosl.org (Postfix) with ESMTP id 6EE97223 for ; Mon, 11 May 2026 11:58:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 50ED340338 for ; Mon, 11 May 2026 11:58:09 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 0vJiUo0SAObi for ; Mon, 11 May 2026 11:58:08 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org; envelope-from=mgr@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 329554032B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 329554032B Received: from tor.source.kernel.org (tor.source.kernel.org [IPv6:2600:3c04:e001:324:0:1991:8:25]) by smtp2.osuosl.org (Postfix) with ESMTPS id 329554032B for ; Mon, 11 May 2026 11:58:07 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 44B4C6012B; Mon, 11 May 2026 11:58:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD16EC2BCF7; Mon, 11 May 2026 11:57:51 +0000 (UTC) Date: Mon, 11 May 2026 13:57:49 +0200 From: Michael Grzeschik To: Uwe =?iso-8859-15?Q?Kleine-K=F6nig_=28The_Capable_Hub=29?= Message-ID: References: <20260511090023.1634387-4-u.kleine-koenig@baylibre.com> <20260511090023.1634387-6-u.kleine-koenig@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260511090023.1634387-6-u.kleine-koenig@baylibre.com> X-Mailman-Approved-At: Mon, 11 May 2026 17:33:18 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778500686; bh=KF1t/bRGs16yza3DBTgFCMGGOZGbS2ZRe4/jmsnl72o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jvjdQJFhfyjs3E/5QNKeFp1jTRAOxDNvz4Mh8U1RxGbjks/gpXVIlmydk3WFacZhD l3f9a2vKk3bOmeWc34go+yHhoRM3iBRq3LZ8M7XZ59udEW1MqdS7mKupb4h1wVV4Do KkvCSR3C+uHG3tH2YS5uwHfM+9OpvFxe4qYtM2DSiMg7qYdP1QRCHem+lUwMYjOqmr X5gNyzzBOvSy7yuBJdyKREHmHjj5av7KbAFq6bfRiAEx+MwwD+2sRATPB1Q8jc1b4u FTEA9GZv56qYWosTkb/DEeuVpP3AGfbpItzeaDDDn/7i4IwntV9jTHGbBse/kGCO8p EO/cNlRqVgdlg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=jvjdQJFh Subject: Re: [Intel-wired-lan] [PATCH net-next v3 2/2] net: Consistently define pci_device_ids using named initializers X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Cochran , Marco Crivellari , Randy Dunlap , Yonglong Liu , Kees Cook , linux-wireless@vger.kernel.org, Ian Lin , brcm80211@lists.linux.dev, Daniele Venzano , Eric Dumazet , netdev@vger.kernel.org, Tony Nguyen , MD Danish Anwar , Samuel Chessman , Fan Gong , Mengyuan Lou , Kevin Curtis , Ingo Molnar , Ion Badulescu , Yeounsu Moon , Manish Chopra , Colin Ian King , Przemek Kitszel , Thomas Fourier , Aleksandr Loktionov , Denis Kirjanov , intel-wired-lan@lists.osuosl.org, linux-parisc@vger.kernel.org, Jacob Keller , Jakub Kicinski , Paolo Abeni , Steffen Klassert , Stanislav Yakovlev , linux-rdma@vger.kernel.org, Arend van Spriel , nic_swsd@realtek.com, Jiri Pirko , Larysa Zaremba , Ido Schimmel , Potnuri Bharat Teja , Double Lo , Markus Schneider-Pargmann , Nathan Chancellor , Jiawen Wu , Cai Huoqing , Mark Einon , Bjorn Helgaas , Zilin Guan , linux-can@vger.kernel.org, Yibo Dong , Andy Shevchenko , Petr Machata , Kory Maincent , brcm80211-dev-list.pdl@broadcom.com, GR-Linux-NIC-Dev@marvell.com, Vadim Fedorenko , Leon Romanovsky , Denis Benato , Rasesh Mody , David Arinzon , oss-drivers@corigine.com, Vincent Mailhol , Mark Bloch , linux-kernel@vger.kernel.org, Tariq Toukan , Jian Shen , Jijie Shao , Andrew Lunn , Thomas Gleixner , Simon Horman , Yicong Hui , Marc Kleine-Budde , Johannes Berg , Ethan Nelson-Moore , Saeed Mahameed , "David S. Miller" , Heiner Kallweit Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Mon, May 11, 2026 at 11:00:24AM +0200, Uwe Kleine-König (The Capable Hub) wrote: > ... and PCI device helpers. > > The various struct pci_device_id arrays were initialized mostly by one > the PCI_DEVICE macros and then list expressions. The latter isn't easily > readable if you're not into PCI. Using named initializers is more > explicit and thus easier to parse. > > Also use PCI_DEVICE* helper macros to assign .vendor, .device, > .subvendor and .subdevice where appropriate and skip explicit > assignments of 0 (which the compiler takes care of). > > The secret plan is to make struct pci_device_id::driver_data an > anonymous union (similar to > https://lore.kernel.org/all/cover.1776579304.git.u.kleine-koenig@baylibre.com/) > and that requires named initializers. But it's also a nice cleanup on > its own. > > This change doesn't introduce changes to the compiled pci_device_id > arrays. Tested on x86 and arm64. > > Reviewed-by: Jijie Shao > Acked-by: Arend van Spriel > Reviewed-by: Aleksandr Loktionov > Reviewed-by: Petr Machata # for mlxsw > Acked-by: Jacob Keller > Acked-by: Johannes Berg > Signed-off-by: Uwe Kleine-König (The Capable Hub) > Forwarded: id:76da4f44d48bdde84580963862bf9616bee5c9e9.1778149923.git.u.kleine-koenig@baylibre.com (v2) > --- > drivers/net/arcnet/com20020-pci.c | 242 +++------ [...] > diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c > index dbadda08dce2..6474c7be2992 100644 > --- a/drivers/net/arcnet/com20020-pci.c > +++ b/drivers/net/arcnet/com20020-pci.c > @@ -459,168 +459,88 @@ static struct com20020_pci_card_info card_info_eae_fb2 = { > > static const struct pci_device_id com20020pci_id_table[] = { > { > - 0x1571, 0xa001, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - 0, > + PCI_DEVICE(0x1571, 0xa001), > + .driver_data = 0, > + }, { > + PCI_DEVICE(0x1571, 0xa002), > + .driver_data = 0, > + }, { > + PCI_DEVICE(0x1571, 0xa003), > + .driver_data = 0, > + }, { > + PCI_DEVICE(0x1571, 0xa004), > + .driver_data = 0, > + }, { > + PCI_DEVICE(0x1571, 0xa005), > + .driver_data = 0, > + }, { > + PCI_DEVICE(0x1571, 0xa006), > + .driver_data = 0, > + }, { > + PCI_DEVICE(0x1571, 0xa007), > + .driver_data = 0, > + }, { > + PCI_DEVICE(0x1571, 0xa008), > + .driver_data = 0, > + }, { > + PCI_DEVICE(0x1571, 0xa009), > + .driver_data = (kernel_ulong_t)&card_info_5mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa00a), > + .driver_data = (kernel_ulong_t)&card_info_5mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa00b), > + .driver_data = (kernel_ulong_t)&card_info_5mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa00c), > + .driver_data = (kernel_ulong_t)&card_info_5mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa00d), > + .driver_data = (kernel_ulong_t)&card_info_5mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa00e), > + .driver_data = (kernel_ulong_t)&card_info_5mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa201), > + .driver_data = (kernel_ulong_t)&card_info_10mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa202), > + .driver_data = (kernel_ulong_t)&card_info_10mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa203), > + .driver_data = (kernel_ulong_t)&card_info_10mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa204), > + .driver_data = (kernel_ulong_t)&card_info_10mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa205), > + .driver_data = (kernel_ulong_t)&card_info_10mbit, > + }, { > + PCI_DEVICE(0x1571, 0xa206), > + .driver_data = (kernel_ulong_t)&card_info_10mbit, > + }, { > + PCI_DEVICE_SUB(0x10B5, 0x9030, 0x10B5, 0x2978), > + .driver_data = (kernel_ulong_t)&card_info_sohard, > + }, { > + PCI_DEVICE_SUB(0x10B5, 0x9050, 0x10B5, 0x2273), > + .driver_data = (kernel_ulong_t)&card_info_sohard, > + }, { > + PCI_DEVICE_SUB(0x10B5, 0x9050, 0x10B5, 0x3263), > + .driver_data = (kernel_ulong_t)&card_info_eae_arc1, > + }, { > + PCI_DEVICE_SUB(0x10B5, 0x9050, 0x10B5, 0x3292), > + .driver_data = (kernel_ulong_t)&card_info_eae_ma1, > + }, { > + PCI_DEVICE_SUB(0x10B5, 0x9050, 0x10B5, 0x3294), > + .driver_data = (kernel_ulong_t)&card_info_eae_fb2, > + }, { > + PCI_DEVICE(0x14BA, 0x6000), > + .driver_data = (kernel_ulong_t)&card_info_10mbit, > + }, { > + PCI_DEVICE(0x10B5, 0x2200), > + .driver_data = (kernel_ulong_t)&card_info_10mbit, > }, > - { > - 0x1571, 0xa002, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - 0, > - }, > - { > - 0x1571, 0xa003, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - 0 > - }, > - { > - 0x1571, 0xa004, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - 0, > - }, > - { > - 0x1571, 0xa005, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - 0 > - }, > - { > - 0x1571, 0xa006, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - 0 > - }, > - { > - 0x1571, 0xa007, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - 0 > - }, > - { > - 0x1571, 0xa008, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - 0 > - }, > - { > - 0x1571, 0xa009, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_5mbit > - }, > - { > - 0x1571, 0xa00a, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_5mbit > - }, > - { > - 0x1571, 0xa00b, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_5mbit > - }, > - { > - 0x1571, 0xa00c, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_5mbit > - }, > - { > - 0x1571, 0xa00d, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_5mbit > - }, > - { > - 0x1571, 0xa00e, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_5mbit > - }, > - { > - 0x1571, 0xa201, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_10mbit > - }, > - { > - 0x1571, 0xa202, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_10mbit > - }, > - { > - 0x1571, 0xa203, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_10mbit > - }, > - { > - 0x1571, 0xa204, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_10mbit > - }, > - { > - 0x1571, 0xa205, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_10mbit > - }, > - { > - 0x1571, 0xa206, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_10mbit > - }, > - { > - 0x10B5, 0x9030, > - 0x10B5, 0x2978, > - 0, 0, > - (kernel_ulong_t)&card_info_sohard > - }, > - { > - 0x10B5, 0x9050, > - 0x10B5, 0x2273, > - 0, 0, > - (kernel_ulong_t)&card_info_sohard > - }, > - { > - 0x10B5, 0x9050, > - 0x10B5, 0x3263, > - 0, 0, > - (kernel_ulong_t)&card_info_eae_arc1 > - }, > - { > - 0x10B5, 0x9050, > - 0x10B5, 0x3292, > - 0, 0, > - (kernel_ulong_t)&card_info_eae_ma1 > - }, > - { > - 0x10B5, 0x9050, > - 0x10B5, 0x3294, > - 0, 0, > - (kernel_ulong_t)&card_info_eae_fb2 > - }, > - { > - 0x14BA, 0x6000, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_10mbit > - }, > - { > - 0x10B5, 0x2200, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&card_info_10mbit > - }, > - { 0, } > + { } > }; > > MODULE_DEVICE_TABLE(pci, com20020pci_id_table); For the com20020 arcnet driver: Reviewed-by: Michael Grzeschik