Merge tag 'tty-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial driver updates from Greg KH:
 "Here is the big set of tty/serial driver updates for 5.17-rc1.

  Nothing major in here, just lots of good updates and fixes, including:

   - more tty core cleanups from Jiri as well as mxser driver cleanups.
     This is the majority of the core diffstat

   - tty documentation updates from Jiri

   - platform_get_irq() updates

   - various serial driver updates for new features and hardware

   - fifo usage for 8250 console, reducing cpu load a lot

   - LED fix for keyboards, long-time bugfix that went through many
     revisions

   - minor cleanups

  All have been in linux-next for a while with no reported problems"

* tag 'tty-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
  serial: core: Keep mctrl register state and cached copy in sync
  serial: stm32: correct loop for dma error handling
  serial: stm32: fix flow control transfer in DMA mode
  serial: stm32: rework TX DMA state condition
  serial: stm32: move tx dma terminate DMA to shutdown
  serial: pl011: Drop redundant DTR/RTS preservation on close/open
  serial: pl011: Drop CR register reset on set_termios
  serial: pl010: Drop CR register reset on set_termios
  serial: liteuart: fix MODULE_ALIAS
  serial: 8250_bcm7271: Fix return error code in case of dma_alloc_coherent() failure
  Revert "serdev: BREAK/FRAME/PARITY/OVERRUN notification prototype V2"
  tty: goldfish: Use platform_get_irq() to get the interrupt
  serdev: BREAK/FRAME/PARITY/OVERRUN notification prototype V2
  tty: serial: meson: Drop the legacy compatible strings and clock code
  serial: pmac_zilog: Use platform_get_irq() to get the interrupt
  serial: bcm63xx: Use platform_get_irq() to get the interrupt
  serial: ar933x: Use platform_get_irq() to get the interrupt
  serial: vt8500: Use platform_get_irq() to get the interrupt
  serial: altera_jtaguart: Use platform_get_irq_optional() to get the interrupt
  serial: pxa: Use platform_get_irq() to get the interrupt
  ...

diff --combined drivers/net/can/slcan.c
index d4c7ce9,1137637..27783fb
--- 1/drivers/net/can/slcan.c
--- 2/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@@ -218,9 -218,7 +218,9 @@@ static void slc_bump(struct slcan *sl
        skb_put_data(skb, &cf, sizeof(struct can_frame));
  
        sl->dev->stats.rx_packets++;
 -      sl->dev->stats.rx_bytes += cf.len;
 +      if (!(cf.can_id & CAN_RTR_FLAG))
 +              sl->dev->stats.rx_bytes += cf.len;
 +
        netif_rx_ni(skb);
  }
  
@@@ -290,8 -288,6 +290,8 @@@ static void slc_encaps(struct slcan *sl
        if (!(cf->can_id & CAN_RTR_FLAG)) {
                for (i = 0; i < cf->len; i++)
                        pos = hex_byte_pack_upper(pos, cf->data[i]);
 +
 +              sl->dev->stats.tx_bytes += cf->len;
        }
  
        *pos++ = '\r';
@@@ -308,6 -304,7 +308,6 @@@
        actual = sl->tty->ops->write(sl->tty, sl->xbuff, pos - sl->xbuff);
        sl->xleft = (pos - sl->xbuff) - actual;
        sl->xhead = sl->xbuff + actual;
 -      sl->dev->stats.tx_bytes += cf->len;
  }
  
  /* Write out any remaining transmit buffer. Scheduled when tty is writable */
@@@ -673,8 -670,8 +673,8 @@@ static void slcan_hangup(struct tty_str
  }
  
  /* Perform I/O control on an active SLCAN channel. */
- static int slcan_ioctl(struct tty_struct *tty, struct file *file,
-                      unsigned int cmd, unsigned long arg)
+ static int slcan_ioctl(struct tty_struct *tty, unsigned int cmd,
+                      unsigned long arg)
  {
        struct slcan *sl = (struct slcan *) tty->disc_data;
        unsigned int tmp;

diff --combined drivers/net/hamradio/mkiss.c
index edde9c3,a19d6a9..c251e04
--- 1/drivers/net/hamradio/mkiss.c
--- 2/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@@ -794,20 -794,20 +794,20 @@@ static void mkiss_close(struct tty_stru
         */
        netif_stop_queue(ax->dev);
  
 -      ax->tty = NULL;
 -
        unregister_netdev(ax->dev);
  
        /* Free all AX25 frame buffers after unreg. */
        kfree(ax->rbuff);
        kfree(ax->xbuff);
  
 +      ax->tty = NULL;
 +
        free_netdev(ax->dev);
  }
  
  /* Perform I/O control on an active ax25 channel. */
- static int mkiss_ioctl(struct tty_struct *tty, struct file *file,
-       unsigned int cmd, unsigned long arg)
+ static int mkiss_ioctl(struct tty_struct *tty, unsigned int cmd,
+               unsigned long arg)
  {
        struct mkiss *ax = mkiss_get(tty);
        struct net_device *dev;

diff --combined include/linux/pci_ids.h
index b5248f2,c389a9c..8667858
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -555,7 -555,6 +555,7 @@@
  #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
  #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
  #define PCI_DEVICE_ID_AMD_19H_DF_F3   0x1653
 +#define PCI_DEVICE_ID_AMD_19H_M10H_DF_F3 0x14b0
  #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F3 0x167c
  #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
  #define PCI_DEVICE_ID_AMD_CNB17H_F3   0x1703
@@@ -1965,24 -1964,6 +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