diff options
Diffstat (limited to 'drivers/serial/serial_ns16550_pci.c')
| -rw-r--r-- | drivers/serial/serial_ns16550_pci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/serial/serial_ns16550_pci.c b/drivers/serial/serial_ns16550_pci.c index 392a2810d8..f82b5797ce 100644 --- a/drivers/serial/serial_ns16550_pci.c +++ b/drivers/serial/serial_ns16550_pci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Probe module for 8250/16550-type PCI serial ports. * @@ -1203,7 +1203,7 @@ static int pci_quatech_init(struct pci_dev *dev) outl(inl(base + 0x38) | 0x00002000, base + 0x38); tmp = inl(base + 0x3c); outl(tmp | 0x01000000, base + 0x3c); - outl(tmp &= ~0x01000000, base + 0x3c); + outl(tmp & ~0x01000000, base + 0x3c); } } return 0; @@ -3656,7 +3656,7 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board) uart.pdata->clock = board->base_baud * 16; for (i = 0; i < nr_ports; i++) { - struct device_d *ns16550_dev; + struct device *ns16550_dev; struct resource *res; rc = quirk->setup(priv, board, &uart, i); @@ -3670,9 +3670,9 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board) res = &uart.resource; - dev_dbg(&dev->dev, "setup PCI %s console @ 0x%llx-0x%llx\n", + dev_dbg(&dev->dev, "setup PCI %s console @ 0x%pa-0x%pa\n", res->flags & IORESOURCE_MEM ? "MMIO" : "IO port", - res->start, res->end); + &res->start, &res->end); ns16550_dev = device_alloc("ns16550_serial", DEVICE_ID_DYNAMIC); ns16550_dev->platform_data = uart.pdata; @@ -3683,9 +3683,9 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board) rc = platform_device_register(ns16550_dev); if (rc < 0) { - dev_err(&dev->dev, "couldn't register PCI %s console @0x%llx: %s\n", + dev_err(&dev->dev, "couldn't register PCI %s console @0x%pa: %s\n", res->flags & IORESOURCE_MEM ? "MMIO" : "IO port", - res->start, strerror(-rc)); + &res->start, strerror(-rc)); break; } |