[v1,09/12] serial: cpm_uart: Remove cpm_uart/ subdirectory

Message ID	9b8b8f89fc386480030f5339abe307541ae436a6.1691068700.git.christophe.leroy@csgroup.eu
State	New
Headers	show Return-Path: <linux-serial-owner@vger.kernel.org> From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jirislaby@kernel.org>, Michael Ellerman <mpe@ellerman.id.au>, Nicholas Piggin <npiggin@gmail.com>, Timur Tabi <timur@kernel.org> Cc: Christophe Leroy <christophe.leroy@csgroup.eu>, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-serial@vger.kernel.org Subject: [PATCH v1 09/12] serial: cpm_uart: Remove cpm_uart/ subdirectory Date: Thu, 3 Aug 2023 15:56:50 +0200 Message-ID: <9b8b8f89fc386480030f5339abe307541ae436a6.1691068700.git.christophe.leroy@csgroup.eu> In-Reply-To: <cover.1691068700.git.christophe.leroy@csgroup.eu> References: <cover.1691068700.git.christophe.leroy@csgroup.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	serial: cpm_uart: Cleanup and refactoring \| expand [v1,00/12] serial: cpm_uart: Cleanup and refactoring [v1,01/12] serial: cpm_uart: Avoid suspicious locking [v1,02/12] serial: cpm_uart: Remove stale prototypes and table and macros [v1,03/12] serial: cpm_uart: Stop using fs_uart_id enum [v1,04/12] serial: cpm_uart: Use get_baudrate() instead of uart_baudrate() [v1,05/12] serial: cpm_uart: Deduplicate cpm_set_{brg/smc_fcr/scc_fcr}() [v1,06/12] serial: cpm_uart: Deduplicate cpm_line_cr_cmd() [v1,07/12] serial: cpm_uart: Refactor cpm_uart_allocbuf()/cpm_uart_freebuf() [v1,08/12] serial: cpm_uart: Refactor cpm_uart_[un]map_pram() [v1,09/12] serial: cpm_uart: Remove cpm_uart/ subdirectory [v1,10/12] serial: cpm_uart: Remove stale prototype in powerpc/fsl_soc.c [v1,11/12] serial: cpm_uart: Don't include fs_uart_pd.h when not needed [v1,12/12] serial: cpm_uart: Remove linux/fs_uart_pd.h

Message ID

9b8b8f89fc386480030f5339abe307541ae436a6.1691068700.git.christophe.leroy@csgroup.eu

State

New

Headers

From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jirislaby@kernel.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Nicholas Piggin <npiggin@gmail.com>,
        Timur Tabi <timur@kernel.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
        linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
        linux-serial@vger.kernel.org
Subject: [PATCH v1 09/12] serial: cpm_uart: Remove cpm_uart/ subdirectory
Date: Thu,  3 Aug 2023 15:56:50 +0200
Message-ID: 
 <9b8b8f89fc386480030f5339abe307541ae436a6.1691068700.git.christophe.leroy@csgroup.eu>
In-Reply-To: <cover.1691068700.git.christophe.leroy@csgroup.eu>
References: <cover.1691068700.git.christophe.leroy@csgroup.eu>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

serial: cpm_uart: Cleanup and refactoring | expand

Commit Message

Christophe Leroy Aug. 3, 2023, 1:56 p.m. UTC

cpm_uart/ subdirectory only has cpm_uart_core.c and cpm_uart.h now.

Move them up and remove cpm_uart/ directory while renaming
cpm_uart_core.c as cpm_uart.c

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 drivers/tty/serial/Makefile                                 | 2 +-
 drivers/tty/serial/{cpm_uart/cpm_uart_core.c => cpm_uart.c} | 0
 drivers/tty/serial/{cpm_uart => }/cpm_uart.h                | 0
 drivers/tty/serial/cpm_uart/Makefile                        | 6 ------
 4 files changed, 1 insertion(+), 7 deletions(-)
 rename drivers/tty/serial/{cpm_uart/cpm_uart_core.c => cpm_uart.c} (100%)
 rename drivers/tty/serial/{cpm_uart => }/cpm_uart.h (100%)
 delete mode 100644 drivers/tty/serial/cpm_uart/Makefile

diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index d4123469583d..138abbc89738 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -41,7 +41,7 @@  obj-$(CONFIG_SERIAL_HS_LPC32XX) += lpc32xx_hs.o
 obj-$(CONFIG_SERIAL_DZ) += dz.o
 obj-$(CONFIG_SERIAL_ZS) += zs.o
 obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o
-obj-$(CONFIG_SERIAL_CPM) += cpm_uart/
+obj-$(CONFIG_SERIAL_CPM) += cpm_uart.o
 obj-$(CONFIG_SERIAL_IMX) += imx.o
 obj-$(CONFIG_SERIAL_IMX_EARLYCON) += imx_earlycon.o
 obj-$(CONFIG_SERIAL_MPC52xx) += mpc52xx_uart.o
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart.c
similarity index 100%
rename from drivers/tty/serial/cpm_uart/cpm_uart_core.c
rename to drivers/tty/serial/cpm_uart.c
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart.h
similarity index 100%
rename from drivers/tty/serial/cpm_uart/cpm_uart.h
rename to drivers/tty/serial/cpm_uart.h
diff --git a/drivers/tty/serial/cpm_uart/Makefile b/drivers/tty/serial/cpm_uart/Makefile
deleted file mode 100644
index 91f202fa5251..000000000000
--- a/drivers/tty/serial/cpm_uart/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@ 
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for the Motorola 8xx FEC ethernet controller
-#
-
-obj-$(CONFIG_SERIAL_CPM) += cpm_uart_core.o

[v1,09/12] serial: cpm_uart: Remove cpm_uart/ subdirectory

Commit Message

Patch