This series is a dust removal and cleanup of cpm_uart serial driver. After cleaning up things we see that CPM1 and CPM2 have so much in common that it is not worth keeping separate code. Once refactoring is done, there is only one .c and one .h in cpm_uart/ subdirectory so its worth getting rid of cpm_uart/ subdir. The last part leads to the complete removal of include/linux/fs_uart_pd.h Christophe Leroy (12): serial: cpm_uart: Avoid suspicious locking serial: cpm_uart: Remove stale prototypes and table and macros serial: cpm_uart: Stop using fs_uart_id enum serial: cpm_uart: Use get_baudrate() instead of uart_baudrate() serial: cpm_uart: Deduplicate cpm_set_{brg/smc_fcr/scc_fcr}() serial: cpm_uart: Deduplicate cpm_line_cr_cmd() serial: cpm_uart: Refactor cpm_uart_allocbuf()/cpm_uart_freebuf() serial: cpm_uart: Refactor cpm_uart_[un]map_pram() serial: cpm_uart: Remove cpm_uart/ subdirectory serial: cpm_uart: Remove stale prototype in powerpc/fsl_soc.c serial: cpm_uart: Don't include fs_uart_pd.h when not needed serial: cpm_uart: Remove linux/fs_uart_pd.h arch/powerpc/include/asm/fs_pd.h | 10 -- arch/powerpc/platforms/8xx/mpc885ads_setup.c | 1 - arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 - arch/powerpc/sysdev/fsl_soc.c | 2 - drivers/tty/serial/Makefile | 2 +- .../{cpm_uart/cpm_uart_core.c => cpm_uart.c} | 157 ++++++++++++++++-- drivers/tty/serial/{cpm_uart => }/cpm_uart.h | 38 +---- drivers/tty/serial/cpm_uart/Makefile | 12 -- drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c | 122 -------------- drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h | 33 ---- drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 156 ----------------- drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h | 33 ---- drivers/tty/serial/ucc_uart.c | 1 - include/linux/fs_uart_pd.h | 71 -------- 14 files changed, 145 insertions(+), 494 deletions(-) rename drivers/tty/serial/{cpm_uart/cpm_uart_core.c => cpm_uart.c} (90%) rename drivers/tty/serial/{cpm_uart => }/cpm_uart.h (64%) delete mode 100644 drivers/tty/serial/cpm_uart/Makefile delete mode 100644 drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c delete mode 100644 drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h delete mode 100644 drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c delete mode 100644 drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h delete mode 100644 include/linux/fs_uart_pd.h -- 2.41.0