lkml.org 
[lkml]   [2021]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 18/19] mxser: move ids from pci_ids.h here
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
>

\
 
 \ /
  Last update: 2021-11-18 21:58    [W:0.074 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site