Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
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 1/4] tty: serial: 8250: Cleanup MOXA configurations in 8250_pci.c
Date:   Mon,  2 Oct 2023 09:56:59 +0800
Message-Id: <20231002015702.30509-2-crescentcy.hsieh@moxa.com>
In-Reply-To: <20231002015702.30509-1-crescentcy.hsieh@moxa.com>
References: <20231002015702.30509-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?N3V7kCVvsNtQuUqW/wdUzi3CGGbcjynVK0qAbmq6P+eygLwF+OZuAtKnMFCf?=
 =?us-ascii?Q?osxBjfr/Gvt5m5zu837KOUZYNsJfxRolUL7x/feIa7JQZlOqybFhR2XMUAcK?=
 =?us-ascii?Q?xhemULU8Bq6qlN+S0GoEvpBcXNFTx59Pvw8L/YGZCGnqY53BcWwrm2SAlrCJ?=
 =?us-ascii?Q?VV6xP6KoOxHLKKKJeYNfGnzpwwav5ytiuOxzXvaxsVh9VGYUQRrX/xHTUiE1?=
 =?us-ascii?Q?9wIraaKg/2SDKbe6N71ppdl7gvklk1e3mN65s1YAeM8303Nywg4ALDMEiBM8?=
 =?us-ascii?Q?5ow6QcoIS5TVcq89wpOiFOQSeI0NqK7JMcAlVEXjlaQI51PqW5i2HoGYC9yV?=
 =?us-ascii?Q?EpI2XOaVS59EOOrWnWLQgavqs3J1gsL7Lc5vX0utDJUkgKLIrcwocQ893jQX?=
 =?us-ascii?Q?O7TToBew6y1e48EyVHTLtujwC/kotuQZCUD2Q6MVB6CN6QYv5dlYWnpz6hXu?=
 =?us-ascii?Q?wUeTkT1AN9aNuWkimG3WM6s7prTvw5VwF+Q18olI0fr6HNpKHWUT7kzKYuky?=
 =?us-ascii?Q?TW+bGghkOgMm0KNvHcRuyjepudB9+7Z4Sew4vZheY9HDXeVod1oBNgV3lgqu?=
 =?us-ascii?Q?c0vY4xP2Wngxu0uQrJj7QsDLkPaVvdLiah+lBhVcK5BVw9sTAeolD/kj43Ug?=
 =?us-ascii?Q?6n95DH569/SnXqDFmqMj1HOamI0L9ChThCIp0CLmDU4kxnwvtXCJospp1X5i?=
 =?us-ascii?Q?S/Ii5lMXh5HoVqN9oEvCtgGFRnlkXHuY0/QnwRh2TxlmF19JkpT1ItxR/w0Z?=
 =?us-ascii?Q?G0cHX0NYBsfTWOVBSsTdQ7ohSYwsrPuSmy4n5tVbMnotUxJ55TSNvYoA2F1h?=
 =?us-ascii?Q?adyDf3M/zgt7+BRgdNFfQJS6fBZuWBzfbwg/ZYFS25hgNd9KajHLl0xRdb4j?=
 =?us-ascii?Q?IFS6cktx+4InveBudkzu8VzyEUXlLBANeeS015EZ5WmYHcACyI/e6QHbj1GS?=
 =?us-ascii?Q?7O/16/ONigqRjBGoGQdnYtA8jml7VpcB/RerFEJ2rHEs3CnZy/rqf1CEHKKQ?=
 =?us-ascii?Q?C86dayUWWCeoEbuM81M8eLEZVwMHPcJXfx0S6kVP5CxY3atFjHmJvFik3rEO?=
 =?us-ascii?Q?d4TwaSab4oyM4TepCwpckhMB6BrBtDvRGNQbQxXwwf24BbJpM9el/5WtcCHe?=
 =?us-ascii?Q?6gA6Xv8Aue5n4r6z1TiC9YayumlGtb4XNdEL8DcRu2Fc5HCgmhaDNmQpMvhu?=
 =?us-ascii?Q?Oqtn2Fq/vAXPy7bJHxMJvPNzrMz1Cym9eQq1So4BH4b07XV9eNSFyP5Q825t?=
 =?us-ascii?Q?hcQEhWYr9h8jqJwMm3xXVWCu3EbtA7L7mj0MlgPucZ2KmbFgoMGc3BPzHKPN?=
 =?us-ascii?Q?b4o5y/51ML4+n1Z0oRXNfulZhI+Me7Nn2RXi+H0NwIVtqI3xVt6XkET7VxyZ?=
 =?us-ascii?Q?Zp+RH0RlmSNPzhqQDjn9/lebXESyAlORGLRPmTTTDSPw2wh6Ds1blUj131YD?=
 =?us-ascii?Q?lccYF+ViwfMyhg4LkT0jUSYey2iAUBSQIlPqJ1G/TBV3DTtF9ET2KzIABl+b?=
 =?us-ascii?Q?YpAVMCHt51mI+5HA3i1lhMihkzSBj6akoOMm2CBKWPybRlAnMDVaSwOtaTnC?=
 =?us-ascii?Q?c69b4jyEIjN1grrEzZQOdEN7t/OlaUndbtScdVg/Nq1NFfcaSsRUGS1poNww?=
 =?us-ascii?Q?hg=3D=3D?=
X-OriginatorOrg: moxa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f6761304-20b5-4775-e040-08dbc2eaec67
X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 01:57:24.9238
 (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: odWFe7d+C9+qobUOIV4bjxWqjxVGRfydeSNVZEBfY2n4JZ0ETZ45zn2VOWdYcdfFaOS6JwjUgiFCCYpR/GrS0gEx5KhYAAOXIzxwe5jkLqE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR0101MB4788
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
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 (howler.vger.email [0.0.0.0]); Sun, 01 Oct 2023 18:58:04 -0700 (PDT)

To enhance the maintainability of MOXA configurations in 8250_pci.c,
clean up the code to achieve simplicity, clarity and consistency.

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

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 62a9bd30b4db..a010790ccfcd 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1887,10 +1887,10 @@ pci_sunix_setup(struct serial_private *priv,
 	return setup_port(priv, port, bar, offset, 0);
 }
 
-static int
-pci_moxa_setup(struct serial_private *priv,
-		const struct pciserial_board *board,
-		struct uart_8250_port *port, int idx)
+static int pci_moxa_setup(struct serial_private *priv,
+			  const struct pciserial_board *board,
+			  struct uart_8250_port *port,
+			  int idx)
 {
 	unsigned int bar = FL_GET_BASE(board->flags);
 	int offset;
@@ -1958,6 +1958,9 @@ pci_moxa_setup(struct serial_private *priv,
 #define PCIE_DEVICE_ID_WCH_CH384_8S	0x3853
 #define PCIE_DEVICE_ID_WCH_CH382_2S	0x3253
 
+/* MOXA */
+#define PCI_VENDOR_ID_MOXA	0x1393
+/* MOXA PCIe */
 #define	PCI_DEVICE_ID_MOXA_CP102E	0x1024
 #define	PCI_DEVICE_ID_MOXA_CP102EL	0x1025
 #define	PCI_DEVICE_ID_MOXA_CP104EL_A	0x1045
@@ -2854,9 +2857,9 @@ enum pci_board_num_t {
 	pbn_titan_2_4000000,
 	pbn_titan_4_4000000,
 	pbn_titan_8_4000000,
-	pbn_moxa8250_2p,
-	pbn_moxa8250_4p,
-	pbn_moxa8250_8p,
+	pbn_moxa_2,
+	pbn_moxa_4,
+	pbn_moxa_8,
 };
 
 /*
@@ -3628,19 +3631,19 @@ static struct pciserial_board pci_boards[] = {
 		.uart_offset	= 0x200,
 		.first_offset	= 0x1000,
 	},
-	[pbn_moxa8250_2p] = {
+	[pbn_moxa_2] = {
 		.flags		= FL_BASE1,
 		.num_ports      = 2,
 		.base_baud      = 921600,
 		.uart_offset	= 0x200,
 	},
-	[pbn_moxa8250_4p] = {
+	[pbn_moxa_4] = {
 		.flags		= FL_BASE1,
 		.num_ports      = 4,
 		.base_baud      = 921600,
 		.uart_offset	= 0x200,
 	},
-	[pbn_moxa8250_8p] = {
+	[pbn_moxa_8] = {
 		.flags		= FL_BASE1,
 		.num_ports      = 8,
 		.base_baud      = 921600,
@@ -5347,44 +5350,20 @@ static const struct pci_device_id serial_pci_tbl[] = {
 		pbn_ni8430_4 },
 
 	/*
-	 * MOXA
+	 * MOXA PCIe
 	 */
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102E,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_2p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102EL,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_2p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_4p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114EL,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_4p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_8p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_8p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_8p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_8p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132EL,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_2p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_4p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_8p },
-	{	PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A,
-		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-		pbn_moxa8250_8p },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102E),	 0, 0, pbn_moxa_2 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102EL),	 0, 0, pbn_moxa_2 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A),	 0, 0, pbn_moxa_4 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114EL),	 0, 0, pbn_moxa_4 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A), 0, 0, pbn_moxa_8 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B), 0, 0, pbn_moxa_8 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A),	 0, 0, pbn_moxa_8 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I), 0, 0, pbn_moxa_8 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132EL),	 0, 0, pbn_moxa_2 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A),	 0, 0, pbn_moxa_4 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A),	 0, 0, pbn_moxa_8 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A),	 0, 0, pbn_moxa_8 },
 
 	/*
 	* ADDI-DATA GmbH communication cards <info@addi-data.com>
-- 
2.34.1