summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2023-08-03 15:56:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-04 15:08:29 +0200
commit42ac6998ec878f640768f03ec2d753f32f51d6a4 (patch)
tree8a367d3e54b2bde5dcb85891fe1e572dd44933f3
parentb5f405e53feabf4b22fb19f05ce1f104c22311df (diff)
downloadlinux-stable-42ac6998ec878f640768f03ec2d753f32f51d6a4.tar.gz
linux-stable-42ac6998ec878f640768f03ec2d753f32f51d6a4.tar.bz2
linux-stable-42ac6998ec878f640768f03ec2d753f32f51d6a4.zip
serial: cpm_uart: Stop using fs_uart_id enum
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> Link: https://lore.kernel.org/r/4772d2a21894db443fe42836421eb22206a334aa.1691068700.git.christophe.leroy@csgroup.eu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/cpm_uart/cpm_uart.h3
-rw-r--r--drivers/tty/serial/cpm_uart/cpm_uart_core.c1
2 files changed, 1 insertions, 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>