From nobody Sat Jun 13 14:52:49 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EE71305E32 for ; Wed, 6 May 2026 15:24:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778081077; cv=none; b=M5N62rkxZkTdgwoJd6keoxoncs329xU8oUX8VwKyviPDvoMxPKrEAY0DepFREe4Jm1G1MDIZdIGzyHBrjxrk4qfwRXLB11N4jhF8ZeFXsxh4nNUjZa5fFY+yKJG2PHBi3jGuKkWEmslEon/t3jqTx+9G7AIQK+osDZTQA41sYVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778081077; c=relaxed/simple; bh=pP5tNNuCYiGlNUB/r9bUEFQat402mWCuSa8QfPyDnw0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=dLJghDqDcRd1i/vis0fupq0LDPdG/B90gBTwPP83PpFmb0s4vHYm72CdOrEZRd+uM1i9gj8A2dFPKRwaeHroSrKh71YA2HR/QqqTvlspBNvnsoOoPqO8AaumWqBH1iHAfkZa778G0BdQQDy5qyn1V01KOHy1zWZz0t+lnFUUEhM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=Tf1bljSB; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="Tf1bljSB" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so7913345e9.1 for ; Wed, 06 May 2026 08:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1778081073; x=1778685873; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=awdRPQLLMvBq7CtOTvMp5uFdxNpuBZA44pDSTpNnuZc=; b=Tf1bljSB8EZ650atHTlTS8gRtc2xt/rwxDoEyiXzFsPdPN6gmrOzVtrmNX7ZT0kb4Q A8ogKw1KgwvklxiSlB7WME1sgHKvT2rC7DIs7ML8eTYK5Lqr+aROVVMOLqTchaD4Ku4R FF+fPw6Ccmo0elXKS9CQeawaluuL5HsyI3EgJzMTQZYIbjhVgNTE7VkNvt2Vf/lU9mGV nwiRMU4TICseYC5+QgM7X+1uOuyB/ZgZz+qhif0XuIoWg+vjuDvU1v30k3wBMImA22B+ luYKcNSuMG0inUugNq8mHlnM7mXiHgY0MSx6jmaMGyE8L8X1ESwOs+/XP8uEpZhwHEDb Medg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778081073; x=1778685873; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=awdRPQLLMvBq7CtOTvMp5uFdxNpuBZA44pDSTpNnuZc=; b=SUCNse0s6TlTeI6CJcB0jmGspD31URBb5CQaNYh361FWtDQGV7WNwHd+qhEoT1YsOZ 0/spcAp8Lu+1YrGbXa068m020tnW8ikQp3Va6HLe0FxTqmT7avTGBPfXmSaBa5XM6Csy NeXVvYkDR3jMB5I5btduWlUI20+BvwmFd9skZIukBo4idHwc3kVDn6/bPOxtF/DYltqj Y/n7UeLBfp1zKQPGDrVZH+TqYkVYuRltDGHMchJn0tsA/vxj3uH1dHwkQHi8s3SZNimo MJA+QMuoecCv/0VCIkx92her6W67nfh42DamNhggAu4kUSI1D/AZg5SrXxX9rhnb/gsM TPNg== X-Gm-Message-State: AOJu0Yw8htRFzZP6eb22Wxyo2N5pBwx7rEreoYl0CZPbNViGOaAAgpmR bIDNJBIKobtMt5W97/ERb8idMWz/1bIYHb0I+fBapkMV2MGCKzNZ+c1f3VSzksBSmZw= X-Gm-Gg: AeBDiesWYlaeaLlz3bVXwzlyN1DQ/s6xojC9hHALgcxZ6u3FMARksb8HFE1h4XqouFJ yw0GeT/8geupXgTje+sYEAl4aiMaYboNiTMX1PfUxvdxBan4eVhvcKAexNSjLAXYoIqgcxZ2iO9 0MyUGAP+7vEfs04MEf6Eng10Z9ChQY945xufCYWW29KtnOD4E467fFo+pBw1xK6Oy3wf9l/Gkb1 UwUpQIl9E08NHbxPxUWZw2w/Iw0b1a0i5gMK1f+0Acb5RnAgEv6omttJvRb7E6jmG7X9qaFzs1q kPOkhH7MgttYh9zysntv4FDkR0d9Tzbo5KDI633vGIH0rVMvdtHCJ13a2P5Qkg48E3t1Y+M0s00 xRNc3TbRRB6Z4v0oBgl0O83QEQT0JfHqbg1VIzk2UaZVEuBxJfo3yLeVIToyjyCuP1iZiQfpKkv MwXFCeIguQLGJYecR+byGRwLzO6uGd2j60GhQv1ytQ80Cp5m5pdBGu4xPhvQbE9zJHGum4Piw/E tncq7LvaHag/baBb/4OE2xn X-Received: by 2002:a05:600c:c096:b0:48a:5821:6006 with SMTP id 5b1f17b1804b1-48e52279541mr39408845e9.4.1778081072923; Wed, 06 May 2026 08:24:32 -0700 (PDT) Received: from localhost (p200300f65f114e08e4d20e057e51ec46.dip0.t-ipconnect.de. [2003:f6:5f11:4e08:e4d2:e05:7e51:ec46]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48e5312dbf8sm18328485e9.23.2026.05.06.08.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 08:24:32 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Dave Penkler Cc: linux-kernel@vger.kernel.org Subject: [PATCH] gpib: Initialize pci_device_ids using PCI_DEVICE macros Date: Wed, 6 May 2026 17:24:24 +0200 Message-ID: <20260506152424.2455439-2-u.kleine-koenig@baylibre.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=4465; i=u.kleine-koenig@baylibre.com; h=from:subject; bh=pP5tNNuCYiGlNUB/r9bUEFQat402mWCuSa8QfPyDnw0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp+10o0ArZYGp8mntPPIXGD1MMpwBL05uggG7jo Ua/JTrOTQCJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaftdKAAKCRCPgPtYfRL+ ToJyB/wOvwgijrIlTQPkd6yjYMmwkrTN0KkclQ0FxIgF5CAGy5UF5SqkpeloMr8BqsYeady9czQ hRuSLYbh4pCZI+KkHDvCEHqtWtT3xvAgNq+t6xVlLqAXyvNORXCrGQ4vI7pYtHAY01C0L4EENPP /zn2ySmIZ3ISUNWoCNw7yvFz2KgEB0SGYIc2JQ4LuxRSlPqupVN4n+gE6SvgcPp+oQpzK7SachF rBR3Pgy+cIfG8H0wcfAxFfCeugregm8J0iEv26K8LoQHxlqMTARh9PCzti04qDZJxhgxampCb0v wfLXs7aKH+QxW8c6gPwtG4SJK+Ojp3KXcFPBdESQ8nmBgTWm X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable The PCI_DEVICE macro and its variants allow to initialize the first four members of a struct pci_device_id in a bit more compact form and also with an easier to grasp semantic. Explicit zeros are not needed, the compiler fills these in automatically. So convert all array members to such a macro and drop unneeded zeros. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- drivers/gpib/agilent_82350b/agilent_82350b.c | 9 ++++----- drivers/gpib/cb7210/cb7210.c | 8 ++++---- drivers/gpib/cec/cec_gpib.c | 4 ++-- drivers/gpib/ines/ines_gpib.c | 21 ++++++++++++-------- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/drivers/gpib/agilent_82350b/agilent_82350b.c b/drivers/gpib/ag= ilent_82350b/agilent_82350b.c index 9787c09faad8..490d44ad1b50 100644 --- a/drivers/gpib/agilent_82350b/agilent_82350b.c +++ b/drivers/gpib/agilent_82350b/agilent_82350b.c @@ -839,11 +839,10 @@ static int agilent_82350b_pci_probe(struct pci_dev *d= ev, const struct pci_device } =20 static const struct pci_device_id agilent_82350b_pci_table[] =3D { - { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_HP, - PCI_SUBDEVICE_ID_82350A, 0, 0, 0 }, - { PCI_VENDOR_ID_AGILENT, PCI_DEVICE_ID_82350B, PCI_ANY_ID, PCI_ANY_ID, 0,= 0, 0 }, - { PCI_VENDOR_ID_AGILENT, PCI_DEVICE_ID_82351A, PCI_ANY_ID, PCI_ANY_ID, 0,= 0, 0 }, - { 0 } + { PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_HP, PCI_SUBD= EVICE_ID_82350A) }, + { PCI_VDEVICE(AGILENT, PCI_DEVICE_ID_82350B) }, + { PCI_VDEVICE(AGILENT, PCI_DEVICE_ID_82351A) }, + { } }; MODULE_DEVICE_TABLE(pci, agilent_82350b_pci_table); =20 diff --git a/drivers/gpib/cb7210/cb7210.c b/drivers/gpib/cb7210/cb7210.c index 6dd8637c5964..c62c30fc3472 100644 --- a/drivers/gpib/cb7210/cb7210.c +++ b/drivers/gpib/cb7210/cb7210.c @@ -1093,10 +1093,10 @@ static int cb7210_pci_probe(struct pci_dev *dev, co= nst struct pci_device_id *id) } =20 static const struct pci_device_id cb7210_pci_table[] =3D { - {PCI_VENDOR_ID_CBOARDS, PCI_DEVICE_ID_CBOARDS_PCI_GPIB, PCI_ANY_ID, PCI_A= NY_ID, 0, 0, 0 }, - {PCI_VENDOR_ID_CBOARDS, PCI_DEVICE_ID_CBOARDS_CPCI_GPIB, PCI_ANY_ID, PCI_= ANY_ID, 0, 0, 0 }, - {PCI_VENDOR_ID_QUANCOM, PCI_DEVICE_ID_QUANCOM_GPIB, PCI_ANY_ID, PCI_ANY_I= D, 0, 0, 0 }, - { 0 } + { PCI_VDEVICE(CBOARDS, PCI_DEVICE_ID_CBOARDS_PCI_GPIB) }, + { PCI_VDEVICE(CBOARDS, PCI_DEVICE_ID_CBOARDS_CPCI_GPIB) }, + { PCI_VDEVICE(QUANCOM, PCI_DEVICE_ID_QUANCOM_GPIB) }, + { } }; MODULE_DEVICE_TABLE(pci, cb7210_pci_table); =20 diff --git a/drivers/gpib/cec/cec_gpib.c b/drivers/gpib/cec/cec_gpib.c index c13bc302d9e9..530a777b1384 100644 --- a/drivers/gpib/cec/cec_gpib.c +++ b/drivers/gpib/cec/cec_gpib.c @@ -353,8 +353,8 @@ static int cec_pci_probe(struct pci_dev *dev, const str= uct pci_device_id *id) } =20 static const struct pci_device_id cec_pci_table[] =3D { - {CEC_VENDOR_ID, CEC_DEV_ID, PCI_ANY_ID, CEC_SUBID, 0, 0, 0 }, - {0} + { PCI_DEVICE_SUB(CEC_VENDOR_ID, CEC_DEV_ID, PCI_ANY_ID, CEC_SUBID) }, + { } }; MODULE_DEVICE_TABLE(pci, cec_pci_table); =20 diff --git a/drivers/gpib/ines/ines_gpib.c b/drivers/gpib/ines/ines_gpib.c index c000f647fbb5..36a5acd46090 100644 --- a/drivers/gpib/ines/ines_gpib.c +++ b/drivers/gpib/ines/ines_gpib.c @@ -336,14 +336,19 @@ enum ines_pci_subdevice_ids { }; =20 static struct pci_device_id ines_pci_table[] =3D { - {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX, - PCI_SUBDEVICE_ID_INES_GPIB, 0, 0, 0}, - {PCI_VENDOR_ID_AMCC, PCI_DEVICE_ID_INES_GPIB_AMCC, PCI_VENDOR_ID_AMCC, - PCI_SUBDEVICE_ID_INES_GPIB, 0, 0, 0}, - {PCI_VENDOR_ID_INES_QUICKLOGIC, PCI_DEVICE_ID_INES_GPIB_QL5030, - PCI_VENDOR_ID_INES_QUICKLOGIC, PCI_DEVICE_ID_INES_GPIB_QL5030, 0, 0, 0}, - {PCI_DEVICE(PCI_VENDOR_ID_QUANCOM, PCI_DEVICE_ID_QUANCOM_GPIB)}, - {0} + { + PCI_VDEVICE_SUB(PLX, PCI_DEVICE_ID_PLX_9050, + PCI_VENDOR_ID_PLX, PCI_SUBDEVICE_ID_INES_GPIB), + }, { + PCI_VDEVICE_SUB(AMCC, PCI_DEVICE_ID_INES_GPIB_AMCC, + PCI_VENDOR_ID_AMCC, PCI_SUBDEVICE_ID_INES_GPIB), + }, { + PCI_VDEVICE_SUB(INES_QUICKLOGIC, PCI_DEVICE_ID_INES_GPIB_QL5030, + PCI_VENDOR_ID_INES_QUICKLOGIC, PCI_DEVICE_ID_INES_GPIB_QL5030), + }, { + PCI_VDEVICE(QUANCOM, PCI_DEVICE_ID_QUANCOM_GPIB), + }, + { } }; MODULE_DEVICE_TABLE(pci, ines_pci_table); =20 base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731 --=20 2.47.3