From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Sep 2023 16:38:00 +0000 (-0700)
Subject: Merge tag 'tty-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8e1e49550dc85694abd04d86a8ee36bc98bd8b9e;p=linux.git

Merge tag 'tty-6.6-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 and serial driver changes for 6.6-rc1.

  Lots of cleanups in here this cycle, and some driver updates. Short
  summary is:

   - Jiri's continued work to make the tty code and apis be a bit more
     sane with regards to modern kernel coding style and types

   - cpm_uart driver updates

   - n_gsm updates and fixes

   - meson driver updates

   - sc16is7xx driver updates

   - 8250 driver updates for different hardware types

   - qcom-geni driver fixes

   - tegra serial driver change

   - stm32 driver updates

   - synclink_gt driver cleanups

   - tty structure size reduction

  All of these have been in linux-next this week with no reported
  issues. The last bit of cleanups from Jiri and the tty structure size
  reduction came in last week, a bit late but as they were just style
  changes and size reductions, I figured they should get into this merge
  cycle so that others can work on top of them with no merge conflicts"

* tag 'tty-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (199 commits)
  tty: shrink the size of struct tty_struct by 40 bytes
  tty: n_tty: deduplicate copy code in n_tty_receive_buf_real_raw()
  tty: n_tty: extract ECHO_OP processing to a separate function
  tty: n_tty: unify counts to size_t
  tty: n_tty: use u8 for chars and flags
  tty: n_tty: simplify chars_in_buffer()
  tty: n_tty: remove unsigned char casts from character constants
  tty: n_tty: move newline handling to a separate function
  tty: n_tty: move canon handling to a separate function
  tty: n_tty: use MASK() for masking out size bits
  tty: n_tty: make n_tty_data::num_overrun unsigned
  tty: n_tty: use time_is_before_jiffies() in n_tty_receive_overrun()
  tty: n_tty: use 'num' for writes' counts
  tty: n_tty: use output character directly
  tty: n_tty: make flow of n_tty_receive_buf_common() a bool
  Revert "tty: serial: meson: Add a earlycon for the T7 SoC"
  Documentation: devices.txt: Fix minors for ttyCPM*
  Documentation: devices.txt: Remove ttySIOC*
  Documentation: devices.txt: Remove ttyIOC*
  serial: 8250_bcm7271: improve bcm7271 8250 port
  ...
---

8e1e49550dc85694abd04d86a8ee36bc98bd8b9e
diff --cc arch/powerpc/include/asm/fs_pd.h
index d530f68b4eef,7b61b80f212d..000000000000
deleted file mode 100644,100644
--- a/arch/powerpc/include/asm/fs_pd.h
+++ /dev/null
@@@ -1,27 -1,39 +1,0 @@@
--/*
-- * Platform information definitions.
-- *
-- * 2006 (c) MontaVista Software, Inc.
-- * Vitaly Bordug <vbordug@ru.mvista.com>
-- *
-- * This file is licensed under the terms of the GNU General Public License
-- * version 2. This program is licensed "as is" without any warranty of any
-- * kind, whether express or implied.
-- */
--
--#ifndef FS_PD_H
--#define FS_PD_H
--#include <sysdev/fsl_soc.h>
--#include <asm/time.h>
--
- static inline int uart_baudrate(void)
- {
-         return get_baudrate();
- }
 -#ifdef CONFIG_CPM2
 -#include <asm/cpm2.h>
--
- static inline int uart_clock(void)
- {
-         return ppc_proc_freq;
- }
 -#if defined(CONFIG_8260)
 -#include <asm/mpc8260.h>
 -#endif
 -
 -#define cpm2_map(member) (&cpm2_immr->member)
 -#define cpm2_map_size(member, size) (&cpm2_immr->member)
 -#define cpm2_unmap(addr) do {} while(0)
 -#endif
 -
 -#ifdef CONFIG_PPC_8xx
 -#include <asm/8xx_immap.h>
 -
 -extern immap_t __iomem *mpc8xx_immr;
 -
 -#define immr_map(member) (&mpc8xx_immr->member)
 -#define immr_map_size(member, size) (&mpc8xx_immr->member)
 -#define immr_unmap(addr) do {} while (0)
 -#endif
--
--#endif
diff --cc arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 76c7cd78c17e,6ecc7fa2a816..2d899be746eb
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@@ -21,7 -21,7 +21,6 @@@
  #include <linux/device.h>
  #include <linux/delay.h>
  
- #include <linux/fs_uart_pd.h>
 -#include <linux/fs_enet_pd.h>
  #include <linux/fsl_devices.h>
  #include <linux/mii.h>
  #include <linux/of_address.h>
diff --cc arch/powerpc/platforms/8xx/tqm8xx_setup.c
index 1670dfd30809,a451f5003abd..d97a7910c594
--- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
@@@ -24,7 -24,7 +24,6 @@@
  #include <linux/device.h>
  #include <linux/delay.h>
  
- #include <linux/fs_uart_pd.h>
 -#include <linux/fs_enet_pd.h>
  #include <linux/fsl_devices.h>
  #include <linux/mii.h>
  #include <linux/of_fdt.h>
diff --cc arch/powerpc/sysdev/fsl_soc.c
index 528506f6e2b8,99fc4c3b94fa..3949ceb79e64
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@@ -22,7 -22,8 +22,6 @@@
  #include <linux/phy.h>
  #include <linux/spi/spi.h>
  #include <linux/fsl_devices.h>
- #include <linux/fs_uart_pd.h>
 -#include <linux/fs_enet_pd.h>
  #include <linux/reboot.h>
  
  #include <linux/atomic.h>
@@@ -35,7 -36,8 +34,6 @@@
  #include <asm/cpm2.h>
  #include <asm/fsl_hcalls.h>	/* For the Freescale hypervisor */
  
- extern void init_smc_ioports(struct fs_uart_platform_info*);
 -extern void init_fcc_ioports(struct fs_platform_info*);
 -extern void init_fec_ioports(struct fs_platform_info*);
  static phys_addr_t immrbase = -1;
  
  phys_addr_t get_immrbase(void)
diff --cc drivers/tty/sysrq.c
index e1df63a88aac,28127bcb146d..23198e3f1461
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@@ -340,9 -339,9 +339,9 @@@ static const struct sysrq_key_op sysrq_
  #define sysrq_ftrace_dump_op (*(const struct sysrq_key_op *)NULL)
  #endif
  
- static void sysrq_handle_showmem(int key)
+ static void sysrq_handle_showmem(u8 key)
  {
 -	show_mem(0, NULL);
 +	show_mem();
  }
  static const struct sysrq_key_op sysrq_showmem_op = {
  	.handler	= sysrq_handle_showmem,