From: Bjorn Helgaas <helgaas@kernel.org>
To: Jiri Slaby <jslaby@suse.cz>
Cc: gregkh@linuxfoundation.org, linux-serial@vger.kernel.org,
linux-kernel@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org
Subject: Re: [PATCH 18/19] mxser: move ids from pci_ids.h here
Date: Thu, 18 Nov 2021 14:58:16 -0600 [thread overview]
Message-ID: <20211118205816.GA1883757@bhelgaas> (raw)
In-Reply-To: <20211118073125.12283-19-jslaby@suse.cz>
On Thu, Nov 18, 2021 at 08:31:24AM +0100, Jiri Slaby wrote:
> There is no point having MOXA PCI device IDs in include/linux/pci_ids.h.
> Move them to the driver and sort them all by the ID.
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: linux-pci@vger.kernel.org
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
I would capitalize "IDs" in the subject as you did in the commit log.
> ---
> drivers/tty/mxser.c | 20 +++++++++++++++++++-
> include/linux/pci_ids.h | 18 ------------------
> 2 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
> index f6842089459a..ba96ffed193a 100644
> --- a/drivers/tty/mxser.c
> +++ b/drivers/tty/mxser.c
> @@ -159,14 +159,32 @@
> #define MXSER_BAUD_BASE 921600
> #define MXSER_CUSTOM_DIVISOR (MXSER_BAUD_BASE * 16)
>
> +#define PCI_DEVICE_ID_MOXA_RC7000 0x0001
> +#define PCI_DEVICE_ID_MOXA_CP102 0x1020
> +#define PCI_DEVICE_ID_MOXA_CP102UL 0x1021
> +#define PCI_DEVICE_ID_MOXA_CP102U 0x1022
> +#define PCI_DEVICE_ID_MOXA_CP102UF 0x1023
> +#define PCI_DEVICE_ID_MOXA_C104 0x1040
> +#define PCI_DEVICE_ID_MOXA_CP104U 0x1041
> +#define PCI_DEVICE_ID_MOXA_CP104JU 0x1042
> +#define PCI_DEVICE_ID_MOXA_CP104EL 0x1043
> #define PCI_DEVICE_ID_MOXA_POS104UL 0x1044
> #define PCI_DEVICE_ID_MOXA_CB108 0x1080
> -#define PCI_DEVICE_ID_MOXA_CP102UF 0x1023
> #define PCI_DEVICE_ID_MOXA_CP112UL 0x1120
> +#define PCI_DEVICE_ID_MOXA_CT114 0x1140
> +#define PCI_DEVICE_ID_MOXA_CP114 0x1141
> #define PCI_DEVICE_ID_MOXA_CB114 0x1142
> #define PCI_DEVICE_ID_MOXA_CP114UL 0x1143
> +#define PCI_DEVICE_ID_MOXA_CP118U 0x1180
> +#define PCI_DEVICE_ID_MOXA_CP118EL 0x1181
> +#define PCI_DEVICE_ID_MOXA_CP132 0x1320
> +#define PCI_DEVICE_ID_MOXA_CP132U 0x1321
> +#define PCI_DEVICE_ID_MOXA_CP134U 0x1340
> #define PCI_DEVICE_ID_MOXA_CB134I 0x1341
> #define PCI_DEVICE_ID_MOXA_CP138U 0x1380
> +#define PCI_DEVICE_ID_MOXA_C168 0x1680
> +#define PCI_DEVICE_ID_MOXA_CP168U 0x1681
> +#define PCI_DEVICE_ID_MOXA_CP168EL 0x1682
>
> #define MXSER_NPORTS(ddata) ((ddata) & 0xffU)
> #define MXSER_HIGHBAUD 0x0100
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index b5248f27910e..86678588d191 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1965,24 +1965,6 @@
> #define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003
>
> #define PCI_VENDOR_ID_MOXA 0x1393
> -#define PCI_DEVICE_ID_MOXA_RC7000 0x0001
> -#define PCI_DEVICE_ID_MOXA_CP102 0x1020
> -#define PCI_DEVICE_ID_MOXA_CP102UL 0x1021
> -#define PCI_DEVICE_ID_MOXA_CP102U 0x1022
> -#define PCI_DEVICE_ID_MOXA_C104 0x1040
> -#define PCI_DEVICE_ID_MOXA_CP104U 0x1041
> -#define PCI_DEVICE_ID_MOXA_CP104JU 0x1042
> -#define PCI_DEVICE_ID_MOXA_CP104EL 0x1043
> -#define PCI_DEVICE_ID_MOXA_CT114 0x1140
> -#define PCI_DEVICE_ID_MOXA_CP114 0x1141
> -#define PCI_DEVICE_ID_MOXA_CP118U 0x1180
> -#define PCI_DEVICE_ID_MOXA_CP118EL 0x1181
> -#define PCI_DEVICE_ID_MOXA_CP132 0x1320
> -#define PCI_DEVICE_ID_MOXA_CP132U 0x1321
> -#define PCI_DEVICE_ID_MOXA_CP134U 0x1340
> -#define PCI_DEVICE_ID_MOXA_C168 0x1680
> -#define PCI_DEVICE_ID_MOXA_CP168U 0x1681
> -#define PCI_DEVICE_ID_MOXA_CP168EL 0x1682
> #define PCI_DEVICE_ID_MOXA_CP204J 0x2040
> #define PCI_DEVICE_ID_MOXA_C218 0x2180
> #define PCI_DEVICE_ID_MOXA_C320 0x3200
> --
> 2.33.1
>
next prev parent reply other threads:[~2021-11-18 20:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 7:31 [PATCH 00/19] mxser: another round of cleanups and fixes Jiri Slaby
2021-11-18 7:31 ` [PATCH 01/19] mxser: remove wait for sent from mxser_close_port Jiri Slaby
2021-11-18 7:31 ` [PATCH 02/19] mxser: rename mxser_close_port() to mxser_stop_rx() Jiri Slaby
2021-11-18 7:31 ` [PATCH 03/19] mxser: keep only !tty test in ISR Jiri Slaby
2021-11-18 7:31 ` [PATCH 04/19] mxser: move MSR read to mxser_check_modem_status() Jiri Slaby
2021-11-18 7:31 ` [PATCH 05/19] mxser: clean up tx handling in mxser_transmit_chars() Jiri Slaby
2021-11-18 7:31 ` [PATCH 06/19] mxser: remove pointless xmit_buf checks Jiri Slaby
2021-11-18 7:31 ` [PATCH 07/19] mxser: remove tty->driver_data NULL check Jiri Slaby
2021-11-18 7:31 ` [PATCH 08/19] mxser: call stop_rx from mxser_shutdown_port() Jiri Slaby
2021-11-18 7:31 ` [PATCH 09/19] mxser: don't flush buffer from mxser_close() directly Jiri Slaby
2021-11-18 7:31 ` [PATCH 10/19] mxser: use tty_port_close() in mxser_close() Jiri Slaby
2021-11-18 7:31 ` [PATCH 11/19] mxser: extract TX empty check from mxser_wait_until_sent() Jiri Slaby
2021-11-18 7:31 ` [PATCH 12/19] mxser: use msleep_interruptible() in mxser_wait_until_sent() Jiri Slaby
2021-11-18 7:31 ` [PATCH 13/19] mxser: clean up timeout handling " Jiri Slaby
2021-11-18 7:31 ` [PATCH 14/19] mxser: don't throttle manually Jiri Slaby
2021-11-18 7:31 ` [PATCH 15/19] mxser: remove tty parameter from mxser_receive_chars_new() Jiri Slaby
2021-11-18 7:31 ` [PATCH 16/19] mxser: increase buf_overrun if tty_insert_flip_char() fails Jiri Slaby
2021-11-18 7:31 ` [PATCH 17/19] mxser: add MOXA prefix to some PCI device IDs Jiri Slaby
2021-11-18 7:31 ` [PATCH 18/19] mxser: move ids from pci_ids.h here Jiri Slaby
2021-11-18 20:58 ` Bjorn Helgaas [this message]
2021-11-18 7:31 ` [PATCH 19/19] mxser: use PCI_DEVICE_DATA Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211118205816.GA1883757@bhelgaas \
--to=helgaas@kernel.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox