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: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
linux-serial@vger.kernel.org
Subject: [PATCH v1 03/12] serial: cpm_uart: Stop using fs_uart_id enum
Date: Thu, 3 Aug 2023 15:56:44 +0200 [thread overview]
Message-ID: <4772d2a21894db443fe42836421eb22206a334aa.1691068700.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1691068700.git.christophe.leroy@csgroup.eu>
Using an enum indirection to define numeric macros is
pointless. Directly use the wanted numeric value.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
drivers/tty/serial/cpm_uart/cpm_uart.h | 3 +--
drivers/tty/serial/cpm_uart/cpm_uart_core.c | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
index 687b48fc6fb6..c220700df693 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart.h
+++ b/drivers/tty/serial/cpm_uart/cpm_uart.h
@@ -11,7 +11,6 @@
#define CPM_UART_H
#include <linux/platform_device.h>
-#include <linux/fs_uart_pd.h>
struct gpio_desc;
@@ -28,7 +27,7 @@ struct gpio_desc;
#define FLAG_SMC 0x00000002
#define FLAG_CONSOLE 0x00000001
-#define UART_NR fs_uart_nr
+#define UART_NR 6
#define RX_NUM_FIFO 4
#define RX_BUF_SIZE 32
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index d804dd4019c0..c5a896f79d80 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -26,7 +26,6 @@
#include <linux/device.h>
#include <linux/memblock.h>
#include <linux/dma-mapping.h>
-#include <linux/fs_uart_pd.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
--
2.41.0
next prev parent reply other threads:[~2023-08-03 13:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 13:56 [PATCH v1 00/12] serial: cpm_uart: Cleanup and refactoring Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 01/12] serial: cpm_uart: Avoid suspicious locking Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 02/12] serial: cpm_uart: Remove stale prototypes and table and macros Christophe Leroy
2023-08-03 13:56 ` Christophe Leroy [this message]
2023-08-03 13:56 ` [PATCH v1 04/12] serial: cpm_uart: Use get_baudrate() instead of uart_baudrate() Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 05/12] serial: cpm_uart: Deduplicate cpm_set_{brg/smc_fcr/scc_fcr}() Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 06/12] serial: cpm_uart: Deduplicate cpm_line_cr_cmd() Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 07/12] serial: cpm_uart: Refactor cpm_uart_allocbuf()/cpm_uart_freebuf() Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 08/12] serial: cpm_uart: Refactor cpm_uart_[un]map_pram() Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 09/12] serial: cpm_uart: Remove cpm_uart/ subdirectory Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 10/12] serial: cpm_uart: Remove stale prototype in powerpc/fsl_soc.c Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 11/12] serial: cpm_uart: Don't include fs_uart_pd.h when not needed Christophe Leroy
2023-08-03 13:56 ` [PATCH v1 12/12] serial: cpm_uart: Remove linux/fs_uart_pd.h Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4772d2a21894db443fe42836421eb22206a334aa.1691068700.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=timur@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).