Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aef3ad10 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29d60981

drivers/tty/serial/serial_core.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

include/linux/serial_core.h

+0 −1
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ struct uart_port { 
	struct device		*dev;			/* parent device */

	unsigned char		hub6;			/* this should be in the 8250 driver */

	unsigned char		suspended;

	unsigned char		irq_wake;

	unsigned char		unused[2];

	const char		*name;			/* port name */

	struct attribute_group	*attr_group;		/* port specific attributes */