Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   Crescent CY Hsieh <crescentcy.hsieh@moxa.com>
To:     gregkh@linuxfoundation.org, jirislaby@kernel.org
Cc:     linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
        Crescent CY Hsieh <crescentcy.hsieh@moxa.com>
Subject: [Patch v2 2/6] tty: serial: 8250: Cleanup MOXA configurations within 8250_pci.c
Date:   Mon, 16 Oct 2023 11:37:01 +0800
Message-Id: <20231016033705.20669-3-crescentcy.hsieh@moxa.com>
In-Reply-To: <20231016033705.20669-1-crescentcy.hsieh@moxa.com>
References: <20231016033705.20669-1-crescentcy.hsieh@moxa.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?a/iHTajVxGh7q955UhcTOOCo7/RDISJ+MIYtvEo0OnD6uE7RyU98pNjoaFj3?=
 =?us-ascii?Q?7nMOWzh2plbBoatpyaY9fxFQkTEQhHvy4Ht+i5B2ocVYao/EG3FHr+vCGPE8?=
 =?us-ascii?Q?zSwK5CUDdKf7UnW3sMXqsLLip1I/8PJkQb/+K4o43OPq9mHub1KGYf1HabK2?=
 =?us-ascii?Q?7T61v0C6eIBueMaZdL6YtDYkIt+HJcCH4pFVisKlylq5z1PAqorK0npr0htu?=
 =?us-ascii?Q?3xK3v8ECnJT7i+zpnDp5/bcJHpxHWYTESchzZcQyQy1ldnnB9yjac2VgnoIl?=
 =?us-ascii?Q?xZwacvQ0KvOnWo54Q8hj5mSZ78QfecYAgDssh5faV1m4K1tRFkuGqRYTGIFS?=
 =?us-ascii?Q?SDbf9AldJFSkhZibt6sBDdCLip2HeP+d7fRVzPmVGc8PoZmfdiaBpRi/VOko?=
 =?us-ascii?Q?OisJ6OmmJrk2KTyJ8tZ7h3HlSfYsjvyVYo6W4WYNj59z88/jCJ6KQHlAsS5R?=
 =?us-ascii?Q?Z0C8R7NKZGYWrBLmKAeuSooQQCUmZT6AUVfDp9s29XCh9vU4IUjxlPmDbF1l?=
 =?us-ascii?Q?O1MNxFNunhHP72nNIGqAFJ8bmngv47mxNcrfWYPWjLYavZVQrcGnLV9Clvjb?=
 =?us-ascii?Q?pPN/Oc091svzalG1d5nLwXOkvbZXYarfn0Xvp2DuctQRfnWZ+BXrUBcg4Y6E?=
 =?us-ascii?Q?+oGGbbe+kho6PD73UvxNhxxY4ycY+Lx5A7lSoy//uV9Pd0iN7Rc8dabmr6XZ?=
 =?us-ascii?Q?/Z64cUDVj/X1rUK1VDvykCGdgoSgNBc4OoUtEy3pYqLIiCOWRfEbTXyzVGhi?=
 =?us-ascii?Q?RFGZGhFAHk2ZsARA1c0YFWVTEH9QIDL0GJDUyG6mxlxp7dLGctP+yzhKdADa?=
 =?us-ascii?Q?apjrxhXFeQjouZrCw9JXHVGsi9mJwo1QWWKkYOGoXQpzl91rsc/qDuyabK68?=
 =?us-ascii?Q?hXtTfW/l7TzgCtqFPf5YxtJ2itIvQGcu6wi63aVAa5qmHnAH9xHe5UtLi8+4?=
 =?us-ascii?Q?xRuJpOMijJ9pvsHXZRL6NkOPT/gAnDMcm8L5YUJ4me2VAef6KpCO1A5HVqEi?=
 =?us-ascii?Q?e7jZJ3BfxJi81jR+jRzfs7m95mepLs/0AJ1c7MW45eEnfa8/a5QnvZvby4Ku?=
 =?us-ascii?Q?OnaEsSphDm+HmgLOTx+/PxgEU950u7tRUQ0MndKhCOlpGNvSAaeahsGWl7dP?=
 =?us-ascii?Q?VSIadPWEvDEpUza5aPTsNAxSNXt3mq7QEeaP6449QG4jzsq5D3wRD1f5klrG?=
 =?us-ascii?Q?sweCJIZq8KEy1ebkxTGvFym/MnGnmuhtaty7W+UXCLe1x6TB4X09uyP7WEN/?=
 =?us-ascii?Q?g9Y6T0CygZR7ABNvhkJKgZHVh6kz2fU+HrOrs6souSu5wWDWPUB9WoUScSeR?=
 =?us-ascii?Q?a4xebygLoFyINa6fXoK2YLitjciFwYpVJLoor/5svYkCHuRIYRB9nCsFNjhY?=
 =?us-ascii?Q?UtnKi+0tRsOVt/AWV6ZFNK5Mw18ZVkI+eMUHp6p97csvivoO3RwVOU0CGO9w?=
 =?us-ascii?Q?kl4NbrChpt+s0N10hgUceMKj1EHp/w6RsSppTlC3pKsc/NKAA6Iq1pi/1DbJ?=
 =?us-ascii?Q?U+o0kCdB65BlHByxfN8+MXn7tg0iLq8IiVM3UlH4puvcNdRdpHXo7rpJo58+?=
 =?us-ascii?Q?5LPBmVlR7aoiO7OM62uauMvlddM3JLnj5FUmzFD4NzYcYI5EDoGd2bb1bCWO?=
 =?us-ascii?Q?dg=3D=3D?=
X-OriginatorOrg: moxa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ea7731a-8927-4771-a96b-08dbcdf96e97
X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 03:38:59.0010
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: y6bM+33QnqP7+3RfZXthm8nMWatIUixjZcpoJ/g/9eM9pDwHVoq+e1Tvw/+6DhgVXFsVoyldPp4vmaBdQszBMKw3HPA3zd4cuYv8bDyQegc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR01MB5156
X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75 autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 15 Oct 2023 20:39:35 -0700 (PDT)

To improve clarity, clean up the MOXA configurations within
serial_pci_tbl.

Signed-off-by: Crescent CY Hsieh <crescentcy.hsieh@moxa.com>
---
 drivers/tty/serial/8250/8250_pci.c | 48 ++++++++----------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 55a788b412bc..fd810a6ee38f 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -5349,42 +5349,18 @@ static const struct pci_device_id serial_pci_tbl[] = {
 	/*
 	 * MOXA
 	 */
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102E,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_2 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102EL,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_2 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_4 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114EL,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_4 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_8 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_8 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_8 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_8 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132EL,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_2 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_4 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_8 },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa_8 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102E),	    pbn_moxa_2 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP102EL),    pbn_moxa_2 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A),  pbn_moxa_4 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP114EL),    pbn_moxa_4 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A), pbn_moxa_8 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B), pbn_moxa_8 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A),  pbn_moxa_8 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I), pbn_moxa_8 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP132EL),    pbn_moxa_2 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A),  pbn_moxa_4 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP138E_A),   pbn_moxa_8 },
+	{ PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A),  pbn_moxa_8 },
 
 	/*
 	* ADDI-DATA GmbH communication cards <info@addi-data.com>
-- 
2.34.1