diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-08-13 17:47:42 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 20:51:20 +0200 |
commit | aef3ad103a686f21b746977d4ed21cc1af36f589 (patch) | |
tree | b3b2fd6d61a86f4578eeeb58196a279fb6d0c965 /drivers/tty/serial/serial_core.c | |
parent | 29d60981db522ce301e06e18d9edf8b31b233b89 (diff) | |
download | linux-aef3ad103a686f21b746977d4ed21cc1af36f589.tar.bz2 |
serial: core: remove unneeded irq_wake flag
There is no need to duplicate a flag which IRQ core takes care of.
Replace custom flag by IRQ core API that retrieves its state.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/serial_core.c')
-rw-r--r-- | drivers/tty/serial/serial_core.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 73ce4e2f7a93..220e1d088c9b 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -36,7 +36,7 @@ #include <linux/delay.h> #include <linux/mutex.h> -#include <asm/irq.h> +#include <linux/irq.h> #include <linux/uaccess.h> /* @@ -2083,8 +2083,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport) tty_dev = device_find_child(uport->dev, &match, serial_match_port); if (tty_dev && device_may_wakeup(tty_dev)) { - if (!enable_irq_wake(uport->irq)) - uport->irq_wake = 1; + enable_irq_wake(uport->irq); put_device(tty_dev); mutex_unlock(&port->mutex); return 0; @@ -2147,10 +2146,8 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) tty_dev = device_find_child(uport->dev, &match, serial_match_port); if (!uport->suspended && device_may_wakeup(tty_dev)) { - if (uport->irq_wake) { + if (irqd_is_wakeup_set(irq_get_irq_data((uport->irq)))) disable_irq_wake(uport->irq); - uport->irq_wake = 0; - } put_device(tty_dev); mutex_unlock(&port->mutex); return 0; |