From: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Backport:
- Upstream-Status: Pending.
- Backport fix.
[https://bitbucket.org/andy-shev/linux/commits/0c0df3876adbeb2269526721350117eb0b484ceb?at=master]
Since we switch to runtime PM the old PM hook is not needed anymore.
Remove it here for 8250 driver.
Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Signed-off-by: Nilesh Bacchewar <nilesh.bacche...@intel.com>
---
drivers/tty/serial/8250/8250_core.c | 1 -
drivers/tty/serial/8250/8250_port.c | 12 ------------
include/linux/serial_8250.h | 2 --
3 files changed, 15 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_core.c
b/drivers/tty/serial/8250/8250_core.c
index 3912646..77ae438 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -823,7 +823,6 @@ static int serial8250_probe(struct platform_device *dev)
uart.port.handle_irq = p->handle_irq;
uart.port.handle_break = p->handle_break;
uart.port.set_termios = p->set_termios;
- uart.port.pm = p->pm;
uart.port.dev = &dev->dev;
uart.port.irqflags |= irqflag;
ret = serial8250_register_8250_port(&uart);
diff --git a/drivers/tty/serial/8250/8250_port.c
b/drivers/tty/serial/8250/8250_port.c
index f98559b..830d453 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -2384,7 +2384,6 @@ serial8250_set_ldisc(struct uart_port *port, struct
ktermios *termios)
}
}
-
void serial8250_do_pm(struct uart_port *port, unsigned int state,
unsigned int oldstate)
{
@@ -2394,16 +2393,6 @@ void serial8250_do_pm(struct uart_port *port, unsigned
int state,
}
EXPORT_SYMBOL(serial8250_do_pm);
-static void
-serial8250_pm(struct uart_port *port, unsigned int state,
- unsigned int oldstate)
-{
- if (port->pm)
- port->pm(port, state, oldstate);
- else
- serial8250_do_pm(port, state, oldstate);
-}
-
static unsigned int serial8250_port_size(struct uart_8250_port *pt)
{
if (pt->port.mapsize)
@@ -2721,7 +2710,6 @@ static const struct uart_ops serial8250_pops = {
.shutdown = serial8250_shutdown,
.set_termios = serial8250_set_termios,
.set_ldisc = serial8250_set_ldisc,
- .pm = serial8250_pm,
.type = serial8250_type,
.release_port = serial8250_release_port,
.request_port = serial8250_request_port,
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index d23b2d4..9e0dc74 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -37,8 +37,6 @@ struct plat_serial8250_port {
struct ktermios *new,
struct ktermios *old);
int (*handle_irq)(struct uart_port *);
- void (*pm)(struct uart_port *, unsigned int state,
- unsigned old);
void (*handle_break)(struct uart_port *);
};
--
1.9.1
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
