From: anton.vorontsov@linaro.org (Anton Vorontsov)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/14] serial/amba-pl011: fix ages old copy-paste errors
Date: Sun, 9 Sep 2012 21:11:54 -0700 [thread overview]
Message-ID: <20120910041154.GA29537@lizard> (raw)
In-Reply-To: <20120910040802.GA1261@lizard>
From: Linus Walleij <linus.walleij@linaro.org>
The PL011 driver has a number of symbols referring to "pl01x"
(probably once shared with the pl010 driver) and some even named
"pl010" (probably a pure copy-paste artifact). Lets name all
local static functions with the prefix pl011_* for clarity.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---
The patch was taken from the TTY tree.
If this patch rejects because 'already applied', this means that your
tree is probably based on TTY tree or -next (e.g. -mm). In which case
you don't need this patch, just drop it.
If your tree is based on Linus' tree, you need this patch to not bring
horrible conflicts into -next.
drivers/tty/serial/amba-pl011.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index d3553b5..92b1ac8 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1215,14 +1215,14 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
return IRQ_RETVAL(handled);
}
-static unsigned int pl01x_tx_empty(struct uart_port *port)
+static unsigned int pl011_tx_empty(struct uart_port *port)
{
struct uart_amba_port *uap = (struct uart_amba_port *)port;
unsigned int status = readw(uap->port.membase + UART01x_FR);
return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ? 0 : TIOCSER_TEMT;
}
-static unsigned int pl01x_get_mctrl(struct uart_port *port)
+static unsigned int pl011_get_mctrl(struct uart_port *port)
{
struct uart_amba_port *uap = (struct uart_amba_port *)port;
unsigned int result = 0;
@@ -1285,7 +1285,7 @@ static void pl011_break_ctl(struct uart_port *port, int break_state)
}
#ifdef CONFIG_CONSOLE_POLL
-static int pl010_get_poll_char(struct uart_port *port)
+static int pl011_get_poll_char(struct uart_port *port)
{
struct uart_amba_port *uap = (struct uart_amba_port *)port;
unsigned int status;
@@ -1297,7 +1297,7 @@ static int pl010_get_poll_char(struct uart_port *port)
return readw(uap->port.membase + UART01x_DR);
}
-static void pl010_put_poll_char(struct uart_port *port,
+static void pl011_put_poll_char(struct uart_port *port,
unsigned char ch)
{
struct uart_amba_port *uap = (struct uart_amba_port *)port;
@@ -1637,7 +1637,7 @@ static const char *pl011_type(struct uart_port *port)
/*
* Release the memory region(s) being used by 'port'
*/
-static void pl010_release_port(struct uart_port *port)
+static void pl011_release_port(struct uart_port *port)
{
release_mem_region(port->mapbase, SZ_4K);
}
@@ -1645,7 +1645,7 @@ static void pl010_release_port(struct uart_port *port)
/*
* Request the memory region(s) being used by 'port'
*/
-static int pl010_request_port(struct uart_port *port)
+static int pl011_request_port(struct uart_port *port)
{
return request_mem_region(port->mapbase, SZ_4K, "uart-pl011")
!= NULL ? 0 : -EBUSY;
@@ -1654,18 +1654,18 @@ static int pl010_request_port(struct uart_port *port)
/*
* Configure/autoconfigure the port.
*/
-static void pl010_config_port(struct uart_port *port, int flags)
+static void pl011_config_port(struct uart_port *port, int flags)
{
if (flags & UART_CONFIG_TYPE) {
port->type = PORT_AMBA;
- pl010_request_port(port);
+ pl011_request_port(port);
}
}
/*
* verify the new serial_struct (for TIOCSSERIAL).
*/
-static int pl010_verify_port(struct uart_port *port, struct serial_struct *ser)
+static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser)
{
int ret = 0;
if (ser->type != PORT_UNKNOWN && ser->type != PORT_AMBA)
@@ -1678,9 +1678,9 @@ static int pl010_verify_port(struct uart_port *port, struct serial_struct *ser)
}
static struct uart_ops amba_pl011_pops = {
- .tx_empty = pl01x_tx_empty,
+ .tx_empty = pl011_tx_empty,
.set_mctrl = pl011_set_mctrl,
- .get_mctrl = pl01x_get_mctrl,
+ .get_mctrl = pl011_get_mctrl,
.stop_tx = pl011_stop_tx,
.start_tx = pl011_start_tx,
.stop_rx = pl011_stop_rx,
@@ -1691,13 +1691,13 @@ static struct uart_ops amba_pl011_pops = {
.flush_buffer = pl011_dma_flush_buffer,
.set_termios = pl011_set_termios,
.type = pl011_type,
- .release_port = pl010_release_port,
- .request_port = pl010_request_port,
- .config_port = pl010_config_port,
- .verify_port = pl010_verify_port,
+ .release_port = pl011_release_port,
+ .request_port = pl011_request_port,
+ .config_port = pl011_config_port,
+ .verify_port = pl011_verify_port,
#ifdef CONFIG_CONSOLE_POLL
- .poll_get_char = pl010_get_poll_char,
- .poll_put_char = pl010_put_poll_char,
+ .poll_get_char = pl011_get_poll_char,
+ .poll_put_char = pl011_put_poll_char,
#endif
};
--
1.7.11.5
next prev parent reply other threads:[~2012-09-10 4:11 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 4:08 [PATCH v5 0/14] KGDB/KDB FIQ (NMI) debugger Anton Vorontsov
2012-09-10 4:11 ` Anton Vorontsov [this message]
2012-09-10 4:12 ` [PATCH 02/14] drivers/tty/serial/amba-pl0{10,11}.c: use clk_prepare_enable and clk_disable_unprepare Anton Vorontsov
2012-09-10 4:12 ` [PATCH 03/14] kernel/debug: Mask KGDB NMI upon entry Anton Vorontsov
2012-09-10 4:13 ` [PATCH 04/14] kdb: Implement disable_nmi command Anton Vorontsov
2012-09-10 4:13 ` [PATCH 05/14] kdb: Turn KGDB_KDB=n stubs into static inlines Anton Vorontsov
2012-09-10 4:13 ` [PATCH 06/14] tty/serial/core: Introduce poll_init callback Anton Vorontsov
2012-09-10 11:13 ` Alan Cox
2012-09-10 17:57 ` Anton Vorontsov
2012-09-10 19:18 ` Alan Cox
2012-09-10 4:13 ` [PATCH 07/14] tty/serial/amba-pl011: Implement " Anton Vorontsov
2012-09-10 4:13 ` [PATCH 08/14] tty/serial/kgdboc: Add and wire up clear_irqs callback Anton Vorontsov
2012-09-10 11:16 ` Alan Cox
2012-09-10 17:57 ` Anton Vorontsov
2012-09-10 19:19 ` Alan Cox
2012-09-10 20:13 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 09/14] tty/serial/amba-pl011: Implement " Anton Vorontsov
2012-09-10 11:17 ` Alan Cox
2012-09-10 17:56 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 10/14] tty/serial: Add kgdb_nmi driver Anton Vorontsov
2012-09-10 11:11 ` Alan Cox
2012-09-10 17:54 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 11/14] ARM: Move some macros from entry-armv to entry-header Anton Vorontsov
2012-09-10 4:14 ` [PATCH 12/14] ARM: Add KGDB/KDB FIQ debugger generic code Anton Vorontsov
2012-09-10 4:14 ` [PATCH 13/14] ARM: VIC: Add a couple of low-level FIQ management helpers Anton Vorontsov
2012-09-10 4:14 ` [PATCH 14/14] ARM: versatile: Make able to use UART ports for KGDB FIQ debugger Anton Vorontsov
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=20120910041154.GA29537@lizard \
--to=anton.vorontsov@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).