From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E65E53EC2E0 for ; Thu, 7 May 2026 10:57:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778151445; cv=none; b=NFB6ApFk8Eoggb5yTkIOqpto+wCSbiux/ufJLybqQbJ5Jom8XzyxRo3Er+2Ct0bnG/qM82lI6j/AwlKD5A3SYcwZZ21hMK4jR9Q48lnSXfvPnaqUN48MGwGrmSW7PBTH5mPYiPfsphYX7X9Jm00wwY+mktsNli5Yf+iQlRkRG7k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778151445; c=relaxed/simple; bh=WMCbfhuXrBYuEWLT18FkbVAMISdQACtlTz7psEBX2BA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=uyKk8Vccn/JIQ/pPzZHfU/65Kd6xX7FBy9yQ6+6tOXt/aoFxT4p6PGo8T0MQ/wiAubyAmWbeVrK1huQNU+ahgscu6OTBdci63Ah6N5aPu1yfbvXVvvJlXlMHX+u3UvGzmS0E1uD4DF2me8BsDbg+g0xE+MIF3goLIRw4jWJ8agA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1wKwOz-0001uh-6W; Thu, 07 May 2026 12:56:21 +0200 Received: from moin.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::7b] helo=bjornoya.blackshift.org) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wKwOQ-000uFj-2Z; Thu, 07 May 2026 12:55:47 +0200 Received: from pengutronix.de (p4ffb2dc6.dip0.t-ipconnect.de [79.251.45.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mkl-all@blackshift.org) by smtp.blackshift.org (Postfix) with ESMTPSA id 2374E5302D0; Thu, 07 May 2026 10:55:46 +0000 (UTC) Date: Thu, 7 May 2026 12:55:45 +0200 From: Marc Kleine-Budde To: Uwe =?utf-8?Q?Kleine-K=C3=B6nig_=28The_Capable_Hub=29?= Cc: Michael Grzeschik , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Vincent Mailhol , Krzysztof Halasa , Johannes Berg , Steffen Klassert , David Dillow , Ion Badulescu , Mark Einon , Rasesh Mody , GR-Linux-NIC-Dev@marvell.com, Manish Chopra , Potnuri Bharat Teja , Denis Kirjanov , Jijie Shao , Jian Shen , Cai Huoqing , Fan Gong , Tony Nguyen , Przemek Kitszel , Tariq Toukan , Saeed Mahameed , Leon Romanovsky , Mark Bloch , Ido Schimmel , Petr Machata , Yibo Dong , Heiner Kallweit , nic_swsd@realtek.com, Jiri Pirko , Francois Romieu , Daniele Venzano , Samuel Chessman , Jiawen Wu , Mengyuan Lou , Kevin Curtis , Arend van Spriel , Stanislav Yakovlev , Richard Cochran , Kees Cook , Aleksandr Loktionov , Thomas Gleixner , Jacob Keller , Thomas Fourier , Ingo Molnar , Kory Maincent , Zilin Guan , Vadim Fedorenko , Marco Crivellari , Bjorn Helgaas , David Arinzon , Yeounsu Moon , Denis Benato , Yonglong Liu , Andy Shevchenko , Randy Dunlap , Yicong Hui , MD Danish Anwar , Nathan Chancellor , Ethan Nelson-Moore , Larysa Zaremba , Ian Lin , Colin Ian King , Double Lo , Markus Schneider-Pargmann , Simon Horman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, linux-parisc@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, oss-drivers@corigine.com, linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com Subject: Re: [PATCH net-next v2 1/2] net: Consistently define pci_device_ids using named initializers Message-ID: <20260507-healthy-gainful-fox-500552-mkl@pengutronix.de> X-AI: stop_reason: "refusal" References: <76da4f44d48bdde84580963862bf9616bee5c9e9.1778149923.git.u.kleine-koenig@baylibre.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="bj6moo23k7mnjddb" Content-Disposition: inline In-Reply-To: <76da4f44d48bdde84580963862bf9616bee5c9e9.1778149923.git.u.kleine-koenig@baylibre.com> X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org --bj6moo23k7mnjddb Content-Type: text/plain; protected-headers=v1; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: [PATCH net-next v2 1/2] net: Consistently define pci_device_ids using named initializers MIME-Version: 1.0 > diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/= plx_pci.c > index 08183833c9bc..a03553b80a5d 100644 > --- a/drivers/net/can/sja1000/plx_pci.c > +++ b/drivers/net/can/sja1000/plx_pci.c > @@ -272,124 +272,89 @@ static struct plx_pci_card_info plx_pci_card_info_= asem_dual_can =3D { > static const struct pci_device_id plx_pci_tbl[] =3D { > { > /* Adlink PCI-7841/cPCI-7841 */ > - ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID, > - PCI_ANY_ID, PCI_ANY_ID, > - PCI_CLASS_NETWORK_OTHER << 8, ~0, > - (kernel_ulong_t)&plx_pci_card_info_adlink > - }, > - { > + PCI_DEVICE(ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID), > + .class =3D PCI_CLASS_NETWORK_OTHER << 8, > + .class_mask =3D ~0, > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_adlink, > + }, { > /* Adlink PCI-7841/cPCI-7841 SE */ > - ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID, > - PCI_ANY_ID, PCI_ANY_ID, > - PCI_CLASS_COMMUNICATION_OTHER << 8, ~0, > - (kernel_ulong_t)&plx_pci_card_info_adlink_se > - }, > - { > + PCI_DEVICE(ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID), > + .class =3D PCI_CLASS_COMMUNICATION_OTHER << 8, > + .class_mask =3D ~0, > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_adlink_se, > + }, { > /* esd CAN-PCI/200 */ > - PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, > - PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PCI200, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_esd200 > - }, > - { > + PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9050, > + PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PCI200), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_esd200, > + }, { > /* esd CAN-CPCI/200 */ > - PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, > - PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_CPCI200, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_esd200 > - }, > - { > + PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9030, > + PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_CPCI200), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_esd200, > + }, { > /* esd CAN-PCI104/200 */ > - PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, > - PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PCI104200, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_esd200 > - }, > - { > + PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9030, > + PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PCI104200), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_esd200, > + }, { > /* esd CAN-PCI/266 */ > - PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9056, > - PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PCI266, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_esd266 > - }, > - { > + PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9056, > + PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PCI266), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_esd266, > + }, { > /* esd CAN-PMC/266 */ > - PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9056, > - PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PMC266, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_esd266 > - }, > - { > + PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9056, > + PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PMC266), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_esd266, > + }, { > /* esd CAN-PCIE/2000 */ > - PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9056, > - PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PCIE2000, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_esd2000 > - }, > - { > + PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9056, > + PCI_VENDOR_ID_ESDGMBH, ESD_PCI_SUB_SYS_ID_PCIE2000), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_esd2000, > + }, { > /* IXXAT PC-I 04/PCI card */ > - IXXAT_PCI_VENDOR_ID, IXXAT_PCI_DEVICE_ID, > - PCI_ANY_ID, IXXAT_PCI_SUB_SYS_ID, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_ixxat > - }, > - { > + PCI_DEVICE_SUB(IXXAT_PCI_VENDOR_ID, IXXAT_PCI_DEVICE_ID, > + PCI_ANY_ID, IXXAT_PCI_SUB_SYS_ID), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_ixxat, > + }, { > /* Marathon CAN-bus-PCI card */ > - PCI_VENDOR_ID_PLX, MARATHON_PCI_DEVICE_ID, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_marathon_pci > - }, > - { > + PCI_VDEVICE(PLX, MARATHON_PCI_DEVICE_ID), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_marathon_pci, > + }, { > /* Marathon CAN-bus-PCIe card */ > - PCI_VENDOR_ID_PLX, MARATHON_PCIE_DEVICE_ID, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_marathon_pcie > - }, > - { > + PCI_VDEVICE(PLX, MARATHON_PCIE_DEVICE_ID), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_marathon_pcie, > + }, { > /* TEWS TECHNOLOGIES TPMC810 card */ > - TEWS_PCI_VENDOR_ID, TEWS_PCI_DEVICE_ID_TMPC810, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_tews > - }, > - { > + PCI_DEVICE(TEWS_PCI_VENDOR_ID, TEWS_PCI_DEVICE_ID_TMPC810), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_tews, > + }, { > /* Connect Tech Inc. CANpro/104-Plus Opto (CRG001) card */ > - PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, > - PCI_SUBVENDOR_ID_CONNECT_TECH, CTI_PCI_DEVICE_ID_CRG001, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_cti > - }, > - { > + PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9030, > + PCI_SUBVENDOR_ID_CONNECT_TECH, CTI_PCI_DEVICE_ID_CRG001), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_cti, > + }, { > /* Elcus CAN-200-PCI */ > - CAN200PCI_VENDOR_ID, CAN200PCI_DEVICE_ID, > - CAN200PCI_SUB_VENDOR_ID, CAN200PCI_SUB_DEVICE_ID, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_elcus > - }, > - { > + PCI_DEVICE_SUB(CAN200PCI_VENDOR_ID, CAN200PCI_DEVICE_ID, > + CAN200PCI_SUB_VENDOR_ID, CAN200PCI_SUB_DEVICE_ID), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_elcus, > + }, { > /* moxa */ > - MOXA_PCI_VENDOR_ID, MOXA_PCI_DEVICE_ID, > - PCI_ANY_ID, PCI_ANY_ID, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_moxa > - }, > - { > + PCI_DEVICE(MOXA_PCI_VENDOR_ID, MOXA_PCI_DEVICE_ID), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_moxa, > + }, { > /* ASEM Dual CAN raw */ > - ASEM_RAW_CAN_VENDOR_ID, ASEM_RAW_CAN_DEVICE_ID, > - ASEM_RAW_CAN_SUB_VENDOR_ID, ASEM_RAW_CAN_SUB_DEVICE_ID, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_asem_dual_can > - }, > - { > + PCI_DEVICE_SUB(ASEM_RAW_CAN_VENDOR_ID, ASEM_RAW_CAN_DEVICE_ID, > + ASEM_RAW_CAN_SUB_VENDOR_ID, ASEM_RAW_CAN_SUB_DEVICE_ID), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_asem_dual_can, > + }, { > /* ASEM Dual CAN raw -new model */ > - ASEM_RAW_CAN_VENDOR_ID, ASEM_RAW_CAN_DEVICE_ID, > - ASEM_RAW_CAN_SUB_VENDOR_ID, ASEM_RAW_CAN_SUB_DEVICE_ID_BIS, > - 0, 0, > - (kernel_ulong_t)&plx_pci_card_info_asem_dual_can > + PCI_DEVICE_SUB(ASEM_RAW_CAN_VENDOR_ID, ASEM_RAW_CAN_DEVICE_ID, > + ASEM_RAW_CAN_SUB_VENDOR_ID, ASEM_RAW_CAN_SUB_DEVICE_ID_BIS), > + .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_asem_dual_can, > }, > - { 0,} > + { } Nitpick: can you convert the terminating entry to follow the same style as the rest of the driver: diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/pl= x_pci.c index a03553b80a5d..d69ff0ccfd94 100644 --- a/drivers/net/can/sja1000/plx_pci.c +++ b/drivers/net/can/sja1000/plx_pci.c @@ -353,8 +353,8 @@ static const struct pci_device_id plx_pci_tbl[] =3D { PCI_DEVICE_SUB(ASEM_RAW_CAN_VENDOR_ID, ASEM_RAW_CAN_DEVICE= _ID, ASEM_RAW_CAN_SUB_VENDOR_ID, ASEM_RAW_CAN_SU= B_DEVICE_ID_BIS), .driver_data =3D (kernel_ulong_t)&plx_pci_card_info_asem_d= ual_can, - }, - { } + }, { + } }; MODULE_DEVICE_TABLE(pci, plx_pci_tbl); Marc --=20 Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung N=C3=BCrnberg | Phone: +49-5121-206917-129 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | --bj6moo23k7mnjddb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSl+MghEFFAdY3pYJLMOmT6rpmt0gUCafxvrQAKCRDMOmT6rpmt 0pHeAP9XFcWG4TIkfsDgMbSsjB0BDeIaX/oOHy7GN10y7WrRXAD9HGFep6ozobs7 Ky/tnJ+5OGyoiQeSoshTzXtNkIIEoQA= =kV9y -----END PGP SIGNATURE----- --bj6moo23k7mnjddb--