Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Cai Huoqing <caihuoqing@baidu.com>
To:     <bhelgaas@google.com>, <jonathan.derrick@intel.com>,
        <kw@linux.com>, <lorenzo.pieralisi@arm.com>, <robh@kernel.org>
CC:     <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        Cai Huoqing <caihuoqing@baidu.com>
Subject: [PATCH v2 2/2] PCI: vmd: Make use of PCI_DEVICE_DATA() helper function
Date:   Fri, 23 Jul 2021 09:55:59 +0800
Message-ID: <20210723015559.695-3-caihuoqing@baidu.com>
In-Reply-To: <20210723015559.695-1-caihuoqing@baidu.com>
References: <20210723015559.695-1-caihuoqing@baidu.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

We could make use of PCI_DEVICE_DATA() helper function

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
 drivers/pci/controller/vmd.c | 38 ++++++++++++++++++------------------
 include/linux/pci_ids.h      |  2 ++
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index e3fcdfec58b3..565681ed00a1 100644
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -859,25 +859,25 @@ static int vmd_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(vmd_dev_pm_ops, vmd_suspend, vmd_resume);
 
 static const struct pci_device_id vmd_ids[] = {
-	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_201D),
-		.driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP,},
-	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_28C0),
-		.driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW |
-				VMD_FEAT_HAS_BUS_RESTRICTIONS |
-				VMD_FEAT_CAN_BYPASS_MSI_REMAP,},
-	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x467f),
-		.driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
-				VMD_FEAT_HAS_BUS_RESTRICTIONS |
-				VMD_FEAT_OFFSET_FIRST_VECTOR,},
-	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4c3d),
-		.driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
-				VMD_FEAT_HAS_BUS_RESTRICTIONS |
-				VMD_FEAT_OFFSET_FIRST_VECTOR,},
-	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B),
-		.driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
-				VMD_FEAT_HAS_BUS_RESTRICTIONS |
-				VMD_FEAT_OFFSET_FIRST_VECTOR,},
-	{0,}
+	{ PCI_DEVICE_DATA(INTEL, VMD_201D,
+			  VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP) },
+	{ PCI_DEVICE_DATA(INTEL, VMD_28C0,
+			  VMD_FEAT_HAS_MEMBAR_SHADOW |
+			  VMD_FEAT_HAS_BUS_RESTRICTIONS |
+			  VMD_FEAT_CAN_BYPASS_MSI_REMAP) },
+	{ PCI_DEVICE_DATA(INTEL, VMD_467F,
+			  VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
+			  VMD_FEAT_HAS_BUS_RESTRICTIONS |
+			  VMD_FEAT_OFFSET_FIRST_VECTOR) },
+	{ PCI_DEVICE_DATA(INTEL, VMD_4C3D,
+			  VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
+			  VMD_FEAT_HAS_BUS_RESTRICTIONS |
+			  VMD_FEAT_OFFSET_FIRST_VECTOR) },
+	{ PCI_DEVICE_DATA(INTEL, VMD_9A0B,
+			  VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
+			  VMD_FEAT_HAS_BUS_RESTRICTIONS |
+			  VMD_FEAT_OFFSET_FIRST_VECTOR) },
+	{ },
 };
 MODULE_DEVICE_TABLE(pci, vmd_ids);
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 4bac1831de80..d25552b5ae3e 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2954,6 +2954,8 @@
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_BR		0x3cf5	/* 13.6 */
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1	0x3cf6	/* 12.7 */
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
+#define PCI_DEVICE_ID_INTEL_VMD_467F	0x467f
+#define PCI_DEVICE_ID_INTEL_VMD_4C3D	0x4c3d
 #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_19	0x65f3
 #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
-- 
2.25.1