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

Commit bdc04e31 authored by Alan Cox's avatar Alan Cox Committed by Live-CD User
Browse files

serial: move delta_msr_wait into the tty_port 



This is used by various drivers not just serial and can be extracted
as commonality

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
parent a2bceae0

drivers/char/cyclades.c

+4 −5
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip, 
		if (mdm_change & CyRI)

			info->icount.rng++;



		wake_up_interruptible(&info->delta_msr_wait);

		wake_up_interruptible(&info->port.delta_msr_wait);

	}



	if ((mdm_change & CyDCD) && (info->port.flags & ASYNC_CHECK_CD)) {
@@ -1197,7 +1197,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo) 
			break;

		}

		if (delta_count)

			wake_up_interruptible(&info->delta_msr_wait);

			wake_up_interruptible(&info->port.delta_msr_wait);

		if (special_count)

			tty_schedule_flip(tty);

		tty_kref_put(tty);
@@ -1464,7 +1464,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty) 
		spin_lock_irqsave(&card->card_lock, flags);



		/* Clear delta_msr_wait queue to avoid mem leaks. */

		wake_up_interruptible(&info->delta_msr_wait);

		wake_up_interruptible(&info->port.delta_msr_wait);



		if (info->port.xmit_buf) {

			unsigned char *temp;
@@ -2788,7 +2788,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file, 
		/* note the counters on entry */

		cnow = info->icount;

		spin_unlock_irqrestore(&info->card->card_lock, flags);

		ret_val = wait_event_interruptible(info->delta_msr_wait,

		ret_val = wait_event_interruptible(info->port.delta_msr_wait,

				cy_cflags_changed(info, arg, &cnow));

		break;
@@ -3153,7 +3153,6 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo) 
		info->port.close_delay = 5 * HZ / 10;

		info->port.flags = STD_COM_FLAGS;

		init_completion(&info->shutdown_wait);

		init_waitqueue_head(&info->delta_msr_wait);



		if (cy_is_Z(cinfo)) {

			struct FIRM_ID *firm_id = cinfo->base_addr + ID_ADDRESS;

drivers/char/esp.c

+3 −4
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ static void check_modem_status(struct esp_struct *info) 
			info->icount.dcd++;

		if (status & UART_MSR_DCTS)

			info->icount.cts++;

		wake_up_interruptible(&info->delta_msr_wait);

		wake_up_interruptible(&info->port.delta_msr_wait);

	}



	if ((info->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
@@ -927,7 +927,7 @@ static void shutdown(struct esp_struct *info) 
	 * clear delta_msr_wait queue to avoid mem leaks: we may free the irq

	 * here so the queue might never be waken up

	 */

	wake_up_interruptible(&info->delta_msr_wait);

	wake_up_interruptible(&info->port.delta_msr_wait);

	wake_up_interruptible(&info->break_wait);



	/* stop a DMA transfer on the port being closed */
@@ -1800,7 +1800,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file *file, 
		spin_unlock_irqrestore(&info->lock, flags);

		while (1) {

			/* FIXME: convert to new style wakeup */

			interruptible_sleep_on(&info->delta_msr_wait);

			interruptible_sleep_on(&info->port.delta_msr_wait);

			/* see if a signal did it */

			if (signal_pending(current))

				return -ERESTARTSYS;
@@ -2452,7 +2452,6 @@ static int __init espserial_init(void) 
		info->config.flow_off = flow_off;

		info->config.pio_threshold = pio_threshold;

		info->next_port = ports;

		init_waitqueue_head(&info->delta_msr_wait);

		init_waitqueue_head(&info->break_wait);

		ports = info;

		printk(KERN_INFO "ttyP%d at 0x%04x (irq = %d) is an ESP ",

drivers/char/mxser.c

+3 −5
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ struct mxser_port { 
	struct mxser_mon mon_data;



	spinlock_t slock;

	wait_queue_head_t delta_msr_wait;

};



struct mxser_board {
@@ -818,7 +817,7 @@ static void mxser_check_modem_status(struct tty_struct *tty, 
	if (status & UART_MSR_DCTS)

		port->icount.cts++;

	port->mon_data.modem_status = status;

	wake_up_interruptible(&port->delta_msr_wait);

	wake_up_interruptible(&port->port.delta_msr_wait);



	if ((port->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {

		if (status & UART_MSR_DCD)
@@ -973,7 +972,7 @@ static void mxser_shutdown(struct tty_struct *tty) 
	 * clear delta_msr_wait queue to avoid mem leaks: we may free the irq

	 * here so the queue might never be waken up

	 */

	wake_up_interruptible(&info->delta_msr_wait);

	wake_up_interruptible(&info->port.delta_msr_wait);



	/*

	 * Free the IRQ, if necessary
@@ -1762,7 +1761,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, 
		cnow = info->icount;	/* note the counters on entry */

		spin_unlock_irqrestore(&info->slock, flags);



		return wait_event_interruptible(info->delta_msr_wait,

		return wait_event_interruptible(info->port.delta_msr_wait,

				mxser_cflags_changed(info, arg, &cnow));

	/*

	 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
@@ -2414,7 +2413,6 @@ static int __devinit mxser_initbrd(struct mxser_board *brd, 
		info->port.close_delay = 5 * HZ / 10;

		info->port.closing_wait = 30 * HZ;

		info->normal_termios = mxvar_sdriver->init_termios;

		init_waitqueue_head(&info->delta_msr_wait);

		memset(&info->mon_data, 0, sizeof(struct mxser_mon));

		info->err_shadow = 0;

		spin_lock_init(&info->slock);

drivers/char/tty_port.c

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ void tty_port_init(struct tty_port *port) 
	memset(port, 0, sizeof(*port));

	init_waitqueue_head(&port->open_wait);

	init_waitqueue_head(&port->close_wait);

	init_waitqueue_head(&port->delta_msr_wait);

	mutex_init(&port->mutex);

	spin_lock_init(&port->lock);

	port->close_delay = (50 * HZ) / 100;
@@ -124,6 +125,7 @@ void tty_port_hangup(struct tty_port *port) 
	port->tty = NULL;

	spin_unlock_irqrestore(&port->lock, flags);

	wake_up_interruptible(&port->open_wait);

	wake_up_interruptible(&port->delta_msr_wait);

	tty_port_shutdown(port);

}

EXPORT_SYMBOL(tty_port_hangup);

drivers/serial/8250.c

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up) 
		if (status & UART_MSR_DCTS)

			uart_handle_cts_change(&up->port, status & UART_MSR_CTS);



		wake_up_interruptible(&up->port.state->delta_msr_wait);

		wake_up_interruptible(&up->port.state->port.delta_msr_wait);

	}



	return status;