From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-serial@vger.kernel.org,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Jiri Slaby" <jirislaby@kernel.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
linux-kernel@vger.kernel.org
Cc: "Niklas Schnelle" <schnelle@linux.ibm.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v3 6/6] serial: 8250_rt288x: Remove unnecessary UART_REG_UNMAPPED
Date: Tue, 9 May 2023 14:39:24 +0300 [thread overview]
Message-ID: <20230509113924.19540-7-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230509113924.19540-1-ilpo.jarvinen@linux.intel.com>
As unmapped registers are at the tail of the array, the ARRAY_SIZE()
condition will catch them just fine. No need to define special
value for them.
Convert the arrays to u8 as all entiries are now positive.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/tty/serial/8250/8250_rt288x.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_rt288x.c b/drivers/tty/serial/8250/8250_rt288x.c
index b091a1269bfa..6415ca8d3adf 100644
--- a/drivers/tty/serial/8250/8250_rt288x.c
+++ b/drivers/tty/serial/8250/8250_rt288x.c
@@ -14,10 +14,8 @@
#define RT288X_DL 0x28
-#define UART_REG_UNMAPPED -1
-
/* Au1x00/RT288x UART hardware has a weird register layout */
-static const s8 au_io_in_map[8] = {
+static const u8 au_io_in_map[7] = {
[UART_RX] = 0,
[UART_IER] = 2,
[UART_IIR] = 3,
@@ -25,18 +23,14 @@ static const s8 au_io_in_map[8] = {
[UART_MCR] = 6,
[UART_LSR] = 7,
[UART_MSR] = 8,
- [UART_SCR] = UART_REG_UNMAPPED,
};
-static const s8 au_io_out_map[8] = {
+static const u8 au_io_out_map[5] = {
[UART_TX] = 1,
[UART_IER] = 2,
[UART_FCR] = 4,
[UART_LCR] = 5,
[UART_MCR] = 6,
- [UART_LSR] = UART_REG_UNMAPPED,
- [UART_MSR] = UART_REG_UNMAPPED,
- [UART_SCR] = UART_REG_UNMAPPED,
};
static unsigned int au_serial_in(struct uart_port *p, int offset)
@@ -44,8 +38,7 @@ static unsigned int au_serial_in(struct uart_port *p, int offset)
if (offset >= ARRAY_SIZE(au_io_in_map))
return UINT_MAX;
offset = au_io_in_map[offset];
- if (offset == UART_REG_UNMAPPED)
- return UINT_MAX;
+
return __raw_readl(p->membase + (offset << p->regshift));
}
@@ -54,8 +47,7 @@ static void au_serial_out(struct uart_port *p, int offset, int value)
if (offset >= ARRAY_SIZE(au_io_out_map))
return;
offset = au_io_out_map[offset];
- if (offset == UART_REG_UNMAPPED)
- return;
+
__raw_writel(value, p->membase + (offset << p->regshift));
}
--
2.30.2
prev parent reply other threads:[~2023-05-09 11:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-09 11:39 [PATCH v3 0/6] serial: Separate RT288x/Au1xxx code into own file Ilpo Järvinen
2023-05-09 11:39 ` [PATCH v3 1/6] serial: 8250: Change dl_read/write to handle value as u32 Ilpo Järvinen
2023-05-10 5:47 ` Jiri Slaby
2023-05-09 11:39 ` [PATCH v3 2/6] serial: 8250: Document uart_8250_port's ->dl_read/write() Ilpo Järvinen
2023-05-09 11:39 ` [PATCH v3 3/6] serial: 8250: Add dl_read/write, bugs and mapsize into plat_serial8250_port Ilpo Järvinen
2023-05-10 5:55 ` Jiri Slaby
2023-05-09 11:39 ` [PATCH v3 4/6] serial: 8250: RT288x/Au1xxx code away from core Ilpo Järvinen
2023-05-09 11:39 ` [PATCH v3 5/6] serial: 8250_rt288x: Name non-standard divisor latch reg Ilpo Järvinen
2023-05-09 11:39 ` Ilpo Järvinen [this message]
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=20230509113924.19540-7-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=philmd@linaro.org \
--cc=schnelle@linux.ibm.com \
/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
all inboxes | Powered by JetHome®