From: Anton Vorontsov <cbouatmailru@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Alan Cox <alan@linux.intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Tobias Klauser <tklauser@distanz.ch>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/8] serial: Factor out uart_poll_timeout() from 8250 driver
Date: Fri, 1 Oct 2010 17:21:25 +0400 [thread overview]
Message-ID: <20101001132125.GA25897@oksana.dev.rtsoft.ru> (raw)
In-Reply-To: <20101001132045.GA9649@oksana.dev.rtsoft.ru>
Soon we will use that handy function in the altera_uart driver.
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
---
drivers/serial/8250.c | 14 ++++----------
include/linux/serial_core.h | 8 ++++++++
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 24110f6..61e95dd 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1722,12 +1722,6 @@ static void serial_unlink_irq_chain(struct uart_8250_port *up)
mutex_unlock(&hash_mutex);
}
-/* Base timer interval for polling */
-static inline int poll_timeout(int timeout)
-{
- return timeout > 6 ? (timeout / 2 - 2) : 1;
-}
-
/*
* This function is used to handle ports that do not have an
* interrupt. This doesn't work very well for 16450's, but gives
@@ -1742,7 +1736,7 @@ static void serial8250_timeout(unsigned long data)
iir = serial_in(up, UART_IIR);
if (!(iir & UART_IIR_NO_INT))
serial8250_handle_port(up);
- mod_timer(&up->timer, jiffies + poll_timeout(up->port.timeout));
+ mod_timer(&up->timer, jiffies + uart_poll_timeout(&up->port));
}
static void serial8250_backup_timeout(unsigned long data)
@@ -1787,7 +1781,7 @@ static void serial8250_backup_timeout(unsigned long data)
/* Standard timer interval plus 0.2s to keep the port running */
mod_timer(&up->timer,
- jiffies + poll_timeout(up->port.timeout) + HZ / 5);
+ jiffies + uart_poll_timeout(&up->port) + HZ / 5);
}
static unsigned int serial8250_tx_empty(struct uart_port *port)
@@ -2069,7 +2063,7 @@ static int serial8250_startup(struct uart_port *port)
up->timer.function = serial8250_backup_timeout;
up->timer.data = (unsigned long)up;
mod_timer(&up->timer, jiffies +
- poll_timeout(up->port.timeout) + HZ / 5);
+ uart_poll_timeout(port) + HZ / 5);
}
/*
@@ -2079,7 +2073,7 @@ static int serial8250_startup(struct uart_port *port)
*/
if (!is_real_interrupt(up->port.irq)) {
up->timer.data = (unsigned long)up;
- mod_timer(&up->timer, jiffies + poll_timeout(up->port.timeout));
+ mod_timer(&up->timer, jiffies + uart_poll_timeout(port));
} else {
retval = serial_link_irq_chain(up);
if (retval)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 563e234..ac48082 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -411,6 +411,14 @@ unsigned int uart_get_baud_rate(struct uart_port *port, struct ktermios *termios
unsigned int max);
unsigned int uart_get_divisor(struct uart_port *port, unsigned int baud);
+/* Base timer interval for polling */
+static inline int uart_poll_timeout(struct uart_port *port)
+{
+ int timeout = port->timeout;
+
+ return timeout > 6 ? (timeout / 2 - 2) : 1;
+}
+
/*
* Console helpers.
*/
--
1.7.0.5
next prev parent reply other threads:[~2010-10-01 13:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-01 13:20 [PATCH v2 0/8] Some patches for Altera UART driver Anton Vorontsov
2010-10-01 13:21 ` Anton Vorontsov [this message]
2010-10-01 13:21 ` [PATCH 2/8] altera_uart: Add support for polling mode (IRQ-less) Anton Vorontsov
2010-10-01 13:57 ` Tobias Klauser
2010-10-01 13:21 ` [PATCH 3/8] altera_uart: Add support for getting mapbase and IRQ from resources Anton Vorontsov
2010-10-01 13:21 ` [PATCH 4/8] altera_uart: Add support for different address strides Anton Vorontsov
2010-10-01 14:01 ` Tobias Klauser
2010-10-01 13:22 ` [PATCH 5/8] altera_uart: Make it possible to use Altera UART and 8250 ports together Anton Vorontsov
2010-10-01 12:41 ` Alan Cox
2010-10-01 13:52 ` Anton Vorontsov
2010-10-01 14:18 ` Alan Cox
2010-10-01 15:22 ` Anton Vorontsov
2010-10-01 14:57 ` Alan Cox
2010-10-01 16:05 ` Anton Vorontsov
2010-10-01 14:23 ` [PATCH v3 " Anton Vorontsov
2010-10-01 13:22 ` [PATCH 6/8] altera_uart: Fixup type usage of port flags Anton Vorontsov
2010-10-01 13:54 ` Tobias Klauser
2010-10-01 13:22 ` [PATCH 7/8] altera_uart: Fix missing prototype for registering an early console Anton Vorontsov
2010-10-01 13:52 ` Tobias Klauser
2010-10-01 13:23 ` [PATCH 8/8] altera_uart: Don't use plain integer as NULL pointer Anton Vorontsov
2010-10-01 13:50 ` Tobias Klauser
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=20101001132125.GA25897@oksana.dev.rtsoft.ru \
--to=cbouatmailru@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alan@linux.intel.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=tklauser@distanz.ch \
/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).