On Wed, 22 Dec 2021, Andy Shevchenko wrote:
> In the similar way how it's done in 8250_pericom, derive number of
> UART ports from PCI ID for Acces I/O cards.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
> drivers/tty/serial/8250/8250_exar.c | 37 ++++++++++-------------------
> 1 file changed, 13 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
> index a4508ac0cac9..cf16bd889abd 100644
> --- a/drivers/tty/serial/8250/8250_exar.c
> +++ b/drivers/tty/serial/8250/8250_exar.c
> @@ -611,7 +611,12 @@ exar_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
>
> maxnr = pci_resource_len(pcidev, bar) >> (board->reg_shift + 3);
>
> - nr_ports = board->num_ports ? board->num_ports : pcidev->device & 0x0f;
> + if (pcidev->vendor == PCI_VENDOR_ID_ACCESSIO)
> + nr = BIT(((pcidev->device & 0x38) >> 3) - 1);
Shouldn't this be nr_ports = ...
--
i.
> + else if (board->num_ports)
> + nr_ports = board->num_ports;
> + else
> + nr_ports = pcidev->device & 0x0f;
>
> priv = devm_kzalloc(&pcidev->dev, struct_size(priv, line, nr_ports), GFP_KERNEL);
> if (!priv)
> @@ -710,22 +715,6 @@ static int __maybe_unused exar_resume(struct device *dev)
>
> static SIMPLE_DEV_PM_OPS(exar_pci_pm, exar_suspend, exar_resume);
>
> -static const struct exar8250_board acces_com_2x = {
> - .num_ports = 2,
> - .setup = pci_xr17c154_setup,
> -};
> -
> -static const struct exar8250_board acces_com_4x = {
> - .num_ports = 4,
> - .setup = pci_xr17c154_setup,
> -};
> -
> -static const struct exar8250_board acces_com_8x = {
> - .num_ports = 8,
> - .setup = pci_xr17c154_setup,
> -};
> -
> -
> static const struct exar8250_board pbn_fastcom335_2 = {
> .num_ports = 2,
> .setup = pci_fastcom335_setup,
> @@ -810,13 +799,13 @@ static const struct exar8250_board pbn_exar_XR17V8358 = {
> }
>
> static const struct pci_device_id exar_pci_tbl[] = {
> - EXAR_DEVICE(ACCESSIO, COM_2S, acces_com_2x),
> - EXAR_DEVICE(ACCESSIO, COM_4S, acces_com_4x),
> - EXAR_DEVICE(ACCESSIO, COM_8S, acces_com_8x),
> - EXAR_DEVICE(ACCESSIO, COM232_8, acces_com_8x),
> - EXAR_DEVICE(ACCESSIO, COM_2SM, acces_com_2x),
> - EXAR_DEVICE(ACCESSIO, COM_4SM, acces_com_4x),
> - EXAR_DEVICE(ACCESSIO, COM_8SM, acces_com_8x),
> + EXAR_DEVICE(ACCESSIO, COM_2S, pbn_exar_XR17C15x),
> + EXAR_DEVICE(ACCESSIO, COM_4S, pbn_exar_XR17C15x),
> + EXAR_DEVICE(ACCESSIO, COM_8S, pbn_exar_XR17C15x),
> + EXAR_DEVICE(ACCESSIO, COM232_8, pbn_exar_XR17C15x),
> + EXAR_DEVICE(ACCESSIO, COM_2SM, pbn_exar_XR17C15x),
> + EXAR_DEVICE(ACCESSIO, COM_4SM, pbn_exar_XR17C15x),
> + EXAR_DEVICE(ACCESSIO, COM_8SM, pbn_exar_XR17C15x),
>
> CONNECT_DEVICE(XR17C152, UART_2_232, pbn_connect),
> CONNECT_DEVICE(XR17C154, UART_4_232, pbn_connect),
>
