aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2016-11-14 05:26:51 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-16 04:57:26 -0500
commit7d4e00c6253bc57b1ac0764ca76d4a8642354b54 (patch)
treeeb903f68aeb01ab56c69aa40a974d30ec689387e
parentaf6f9d6883ac95d14271b4613e5813f2938dd4d4 (diff)
serial: 8250_port: export serial8250_rpm_{get|put}_tx()
The following fix of runtime PM use in DMA mode requires at least serial8250_rpm_put_tx() to be available. Export both calls. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250.h5
-rw-r--r--drivers/tty/serial/8250/8250_port.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index a697a8585ddc..124e6e695a3a 100644
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -129,8 +129,13 @@ static inline void serial_dl_write(struct uart_8250_port *up, int value)
129} 129}
130 130
131struct uart_8250_port *serial8250_get_port(int line); 131struct uart_8250_port *serial8250_get_port(int line);
132
132void serial8250_rpm_get(struct uart_8250_port *p); 133void serial8250_rpm_get(struct uart_8250_port *p);
133void serial8250_rpm_put(struct uart_8250_port *p); 134void serial8250_rpm_put(struct uart_8250_port *p);
135
136void serial8250_rpm_get_tx(struct uart_8250_port *p);
137void serial8250_rpm_put_tx(struct uart_8250_port *p);
138
134int serial8250_em485_init(struct uart_8250_port *p); 139int serial8250_em485_init(struct uart_8250_port *p);
135void serial8250_em485_destroy(struct uart_8250_port *p); 140void serial8250_em485_destroy(struct uart_8250_port *p);
136 141
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 1731b98d2471..4a326034c51b 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -636,7 +636,7 @@ EXPORT_SYMBOL_GPL(serial8250_em485_destroy);
636 * once and disable_runtime_pm_tx() will still disable RPM because the fifo is 636 * once and disable_runtime_pm_tx() will still disable RPM because the fifo is
637 * empty and the HW can idle again. 637 * empty and the HW can idle again.
638 */ 638 */
639static void serial8250_rpm_get_tx(struct uart_8250_port *p) 639void serial8250_rpm_get_tx(struct uart_8250_port *p)
640{ 640{
641 unsigned char rpm_active; 641 unsigned char rpm_active;
642 642
@@ -648,8 +648,9 @@ static void serial8250_rpm_get_tx(struct uart_8250_port *p)
648 return; 648 return;
649 pm_runtime_get_sync(p->port.dev); 649 pm_runtime_get_sync(p->port.dev);
650} 650}
651EXPORT_SYMBOL_GPL(serial8250_rpm_get_tx);
651 652
652static void serial8250_rpm_put_tx(struct uart_8250_port *p) 653void serial8250_rpm_put_tx(struct uart_8250_port *p)
653{ 654{
654 unsigned char rpm_active; 655 unsigned char rpm_active;
655 656
@@ -662,6 +663,7 @@ static void serial8250_rpm_put_tx(struct uart_8250_port *p)
662 pm_runtime_mark_last_busy(p->port.dev); 663 pm_runtime_mark_last_busy(p->port.dev);
663 pm_runtime_put_autosuspend(p->port.dev); 664 pm_runtime_put_autosuspend(p->port.dev);
664} 665}
666EXPORT_SYMBOL_GPL(serial8250_rpm_put_tx);
665 667
666/* 668/*
667 * IER sleep support. UARTs which have EFRs need the "extended 669 * IER sleep support. UARTs which have EFRs need the "extended