TTY: add tty_port_tty_wakeup helper

It allows for cleaning up on a considerable amount of places. They did port_get, wakeup, kref_put. Now the only thing needed is to call tty_port_tty_wakeup which does exactly that. One exception is ifx6x60 where tty_wakeup was open-coded. We now call tty_wakeup properly there. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

TTY: add tty_port_tty_wakeup helper
It allows for cleaning up on a considerable amount of places. They did port_get, wakeup, kref_put. Now the only thing needed is to call tty_port_tty_wakeup which does exactly that. One exception is ifx6x60 where tty_wakeup was open-coded. We now call tty_wakeup properly there. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jiri Slaby · Greg Kroah-Hartman
1 parent 6982a39842
Showing 22 changed files with 51 additions and 176 deletions Side-by-side Diff
arch/um/drivers/line.c
drivers/isdn/capi/capi.c
drivers/isdn/gigaset/interface.c
drivers/net/usb/hso.c
drivers/s390/char/sclp_tty.c
drivers/s390/char/sclp_vt220.c
drivers/staging/fwserial/fwserial.c
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/tty/ehv_bytechan.c
drivers/tty/hvc/hvsi.c
drivers/tty/nozomi.c
drivers/tty/serial/ifx6x60.c
drivers/tty/tty_port.c
drivers/usb/class/cdc-acm.c
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/keyspan_pda.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
drivers/usb/serial/ti_usb_3410_5052.c
@@ -248,7 +248,6 @@
 {
 	struct chan *chan = data;
 	struct line *line = chan->line;
-	struct tty_struct *tty;
 	int err;
  
 	/*
@@ -267,12 +266,7 @@
 	}
 	spin_unlock(&line->lock);
  
-	tty = tty_port_tty_get(&line->port);
-	if (tty == NULL)
-		return IRQ_NONE;
-
-	tty_wakeup(tty);
-	tty_kref_put(tty);
+	tty_port_tty_wakeup(&line->port);
  
 	return IRQ_HANDLED;
 }
@@ -569,7 +569,6 @@
 {
 	struct capidev *cdev = ap->private;
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
-	struct tty_struct *tty;
 	struct capiminor *mp;
 	u16 datahandle;
 	struct capincci *np;
@@ -627,11 +626,7 @@
 			 CAPIMSG_U16(skb->data, CAPIMSG_BASELEN + 4 + 2));
 		kfree_skb(skb);
 		capiminor_del_ack(mp, datahandle);
-		tty = tty_port_tty_get(&mp->port);
-		if (tty) {
-			tty_wakeup(tty);
-			tty_kref_put(tty);
-		}
+		tty_port_tty_wakeup(&mp->port);
 		handle_minor_send(mp);
  
 	} else {
@@ -487,12 +487,8 @@
 static void if_wake(unsigned long data)
 {
 	struct cardstate *cs = (struct cardstate *)data;
-	struct tty_struct *tty = tty_port_tty_get(&cs->port);
  
-	if (tty) {
-		tty_wakeup(tty);
-		tty_kref_put(tty);
-	}
+	tty_port_tty_wakeup(&cs->port);
 }
  
 /*** interface to common ***/
@@ -1925,7 +1925,6 @@
 {
 	struct hso_serial *serial = urb->context;
 	int status = urb->status;
-	struct tty_struct *tty;
  
 	/* sanity check */
 	if (!serial) {
@@ -1941,11 +1940,7 @@
 		return;
 	}
 	hso_put_activity(serial->parent);
-	tty = tty_port_tty_get(&serial->port);
-	if (tty) {
-		tty_wakeup(tty);
-		tty_kref_put(tty);
-	}
+	tty_port_tty_wakeup(&serial->port);
 	hso_kick_transmit(serial);
  
 	D1(" ");
  
@@ -2008,12 +2003,8 @@
 		put_rxbuf_data_and_resubmit_ctrl_urb(serial);
 		spin_unlock(&serial->serial_lock);
 	} else {
-		struct tty_struct *tty = tty_port_tty_get(&serial->port);
 		hso_put_activity(serial->parent);
-		if (tty) {
-			tty_wakeup(tty);
-			tty_kref_put(tty);
-		}
+		tty_port_tty_wakeup(&serial->port);
 		/* response to a write command */
 		hso_kick_transmit(serial);
 	}
@@ -107,7 +107,6 @@
 static void
 sclp_ttybuf_callback(struct sclp_buffer *buffer, int rc)
 {
-	struct tty_struct *tty;
 	unsigned long flags;
 	void *page;
  
@@ -125,12 +124,8 @@
 					    struct sclp_buffer, list);
 		spin_unlock_irqrestore(&sclp_tty_lock, flags);
 	} while (buffer && sclp_emit_buffer(buffer, sclp_ttybuf_callback));
-	/* check if the tty needs a wake up call */
-	tty = tty_port_tty_get(&sclp_port);
-	if (tty != NULL) {
-		tty_wakeup(tty);
-		tty_kref_put(tty);
-	}
+
+	tty_port_tty_wakeup(&sclp_port);
 }
  
 static inline void
@@ -114,7 +114,6 @@
 static void
 sclp_vt220_process_queue(struct sclp_vt220_request *request)
 {
-	struct tty_struct *tty;
 	unsigned long flags;
 	void *page;
  
@@ -139,12 +138,7 @@
 	} while (__sclp_vt220_emit(request));
 	if (request == NULL && sclp_vt220_flush_later)
 		sclp_vt220_emit_current();
-	/* Check if the tty needs a wake up call */
-	tty = tty_port_tty_get(&sclp_vt220_port);
-	if (tty) {
-		tty_wakeup(tty);
-		tty_kref_put(tty);
-	}
+	tty_port_tty_wakeup(&sclp_vt220_port);
 }
  
 #define SCLP_BUFFER_MAX_RETRY		1
@@ -744,7 +744,6 @@
 			      struct fwtty_transaction *txn)
 {
 	struct fwtty_port *port = txn->port;
-	struct tty_struct *tty;
 	int len;
  
 	fwtty_dbg(port, "rcode: %d", rcode);
@@ -769,13 +768,8 @@
 		port->stats.dropped += txn->dma_pended.len;
 	}
  
-	if (len < WAKEUP_CHARS) {
-		tty = tty_port_tty_get(&port->port);
-		if (tty) {
-			tty_wakeup(tty);
-			tty_kref_put(tty);
-		}
-	}
+	if (len < WAKEUP_CHARS)
+		tty_port_tty_wakeup(&port->port);
 }
  
 static int fwtty_tx(struct fwtty_port *port, bool drain)
@@ -264,7 +264,6 @@
  
 static void qt_write_bulk_callback(struct urb *urb)
 {
-	struct tty_struct *tty;
 	int status;
 	struct quatech_port *quatech_port;
  
@@ -278,11 +277,7 @@
  
 	quatech_port = urb->context;
  
-	tty = tty_port_tty_get(&quatech_port->port->port);
-
-	if (tty)
-		tty_wakeup(tty);
-	tty_kref_put(tty);
+	tty_port_tty_wakeup(&quatech_port->port->port);
 }
  
 static void qt_interrupt_callback(struct urb *urb)
@@ -472,13 +472,9 @@
 static irqreturn_t ehv_bc_tty_tx_isr(int irq, void *data)
 {
 	struct ehv_bc_data *bc = data;
-	struct tty_struct *ttys = tty_port_tty_get(&bc->port);
  
 	ehv_bc_tx_dequeue(bc);
-	if (ttys) {
-		tty_wakeup(ttys);
-		tty_kref_put(ttys);
-	}
+	tty_port_tty_wakeup(&bc->port);
  
 	return IRQ_HANDLED;
 }
@@ -861,7 +861,6 @@
 {
 	struct hvsi_struct *hp =
 		container_of(work, struct hvsi_struct, writer.work);
-	struct tty_struct *tty;
 	unsigned long flags;
 #ifdef DEBUG
 	static long start_j = 0;
@@ -895,11 +894,7 @@
 		start_j = 0;
 #endif /* DEBUG */
 		wake_up_all(&hp->emptyq);
-		tty = tty_port_tty_get(&hp->port);
-		if (tty) {
-			tty_wakeup(tty);
-			tty_kref_put(tty);
-		}
+		tty_port_tty_wakeup(&hp->port);
 	}
  
 out:
@@ -791,7 +791,6 @@
 	const u8 toggle = port->toggle_ul;
 	void __iomem *addr = port->ul_addr[toggle];
 	const u32 ul_size = port->ul_size[toggle];
-	struct tty_struct *tty = tty_port_tty_get(&port->port);
  
 	/* Get data from tty and place in buf for now */
 	size = kfifo_out(&port->fifo_ul, dc->send_buf,
@@ -799,7 +798,6 @@
  
 	if (size == 0) {
 		DBG4("No more data to send, disable link:");
-		tty_kref_put(tty);
 		return 0;
 	}
  
  
@@ -809,10 +807,8 @@
 	write_mem32(addr, (u32 *) &size, 4);
 	write_mem32(addr + 4, (u32 *) dc->send_buf, size);
  
-	if (tty)
-		tty_wakeup(tty);
+	tty_port_tty_wakeup(&port->port);
  
-	tty_kref_put(tty);
 	return 1;
 }
  
@@ -443,25 +443,6 @@
 }
  
 /**
- *	ifx_spi_wakeup_serial	-	SPI space made
- *	@port_data: our SPI device
- *
- *	We have emptied the FIFO enough that we want to get more data
- *	queued into it. Poke the line discipline via tty_wakeup so that
- *	it will feed us more bits
- */
-static void ifx_spi_wakeup_serial(struct ifx_spi_device *ifx_dev)
-{
-	struct tty_struct *tty;
-
-	tty = tty_port_tty_get(&ifx_dev->tty_port);
-	if (!tty)
-		return;
-	tty_wakeup(tty);
-	tty_kref_put(tty);
-}
-
-/**
  *	ifx_spi_prepare_tx_buffer	-	prepare transmit frame
  *	@ifx_dev: our SPI device
  *
@@ -506,7 +487,7 @@
 			tx_count += temp_count;
 			if (temp_count == queue_length)
 				/* poke port to get more data */
-				ifx_spi_wakeup_serial(ifx_dev);
+				tty_port_tty_wakeup(&ifx_dev->tty_port);
 			else /* more data in port, use next SPI message */
 				ifx_dev->spi_more = 1;
 		}
@@ -683,8 +664,6 @@
 static void ifx_spi_complete(void *ctx)
 {
 	struct ifx_spi_device *ifx_dev = ctx;
-	struct tty_struct *tty;
-	struct tty_ldisc *ldisc = NULL;
 	int length;
 	int actual_length;
 	unsigned char more;
@@ -762,15 +741,7 @@
 			 */
 			ifx_spi_power_state_clear(ifx_dev,
 						  IFX_SPI_POWER_DATA_PENDING);
-			tty = tty_port_tty_get(&ifx_dev->tty_port);
-			if (tty) {
-				ldisc = tty_ldisc_ref(tty);
-				if (ldisc) {
-					ldisc->ops->write_wakeup(tty);
-					tty_ldisc_deref(ldisc);
-				}
-				tty_kref_put(tty);
-			}
+			tty_port_tty_wakeup(&ifx_dev->tty_port);
 		}
 	}
 }
@@ -233,6 +233,22 @@
 EXPORT_SYMBOL(tty_port_hangup);
  
 /**
+ * tty_port_tty_wakeup - helper to wake up a tty
+ *
+ * @port: tty port
+ */
+void tty_port_tty_wakeup(struct tty_port *port)
+{
+	struct tty_struct *tty = tty_port_tty_get(port);
+
+	if (tty) {
+		tty_wakeup(tty);
+		tty_kref_put(tty);
+	}
+}
+EXPORT_SYMBOL_GPL(tty_port_tty_wakeup);
+
+/**
  *	tty_port_carrier_raised	-	carrier raised check
  *	@port: tty port
  *
@@ -475,15 +475,10 @@
 static void acm_softint(struct work_struct *work)
 {
 	struct acm *acm = container_of(work, struct acm, work);
-	struct tty_struct *tty;
  
 	dev_vdbg(&acm->data->dev, "%s\n", __func__);
  
-	tty = tty_port_tty_get(&acm->port);
-	if (!tty)
-		return;
-	tty_wakeup(tty);
-	tty_kref_put(tty);
+	tty_port_tty_wakeup(&acm->port);
 }
  
 /*
@@ -210,7 +210,6 @@
  
 /* Local Function Declarations */
  
-static void digi_wakeup_write(struct usb_serial_port *port);
 static void digi_wakeup_write_lock(struct work_struct *work);
 static int digi_write_oob_command(struct usb_serial_port *port,
 	unsigned char *buf, int count, int interruptible);
  
@@ -374,20 +373,10 @@
 	unsigned long flags;
  
 	spin_lock_irqsave(&priv->dp_port_lock, flags);
-	digi_wakeup_write(port);
+	tty_port_tty_wakeup(&port->port);
 	spin_unlock_irqrestore(&priv->dp_port_lock, flags);
 }
  
-static void digi_wakeup_write(struct usb_serial_port *port)
-{
-	struct tty_struct *tty = tty_port_tty_get(&port->port);
-	if (tty) {
-		tty_wakeup(tty);
-		tty_kref_put(tty);
-	}
-}
-
-
 /*
  *  Digi Write OOB Command
  *
@@ -1044,7 +1033,7 @@
 		}
 	}
 	/* wake up processes sleeping on writes immediately */
-	digi_wakeup_write(port);
+	tty_port_tty_wakeup(&port->port);
 	/* also queue up a wakeup at scheduler time, in case we */
 	/* lost the race in write_chan(). */
 	schedule_work(&priv->dp_wakeup_work);
@@ -1522,7 +1511,7 @@
 				/* port must be open to use tty struct */
 				if (rts) {
 					tty->hw_stopped = 0;
-					digi_wakeup_write(port);
+					tty_port_tty_wakeup(&port->port);
 				}
 			} else {
 				priv->dp_modem_signals &= ~TIOCM_CTS;
@@ -565,7 +565,6 @@
 	struct device *dev;
 	struct edgeport_port *edge_port;
 	struct usb_serial_port *port;
-	struct tty_struct *tty;
 	unsigned char *data = urb->transfer_buffer;
 	int length = urb->actual_length;
 	int bytes_avail;
@@ -644,12 +643,7 @@
  
 					/* tell the tty driver that something
 					   has changed */
-					tty = tty_port_tty_get(
-						&edge_port->port->port);
-					if (tty) {
-						tty_wakeup(tty);
-						tty_kref_put(tty);
-					}
+					tty_port_tty_wakeup(&edge_port->port->port);
 					/* Since we have more credit, check
 					   if more data can be sent */
 					send_more_port_data(edge_serial,
@@ -738,7 +732,6 @@
 static void edge_bulk_out_data_callback(struct urb *urb)
 {
 	struct edgeport_port *edge_port = urb->context;
-	struct tty_struct *tty;
 	int status = urb->status;
  
 	if (status) {
  
@@ -747,15 +740,9 @@
 			__func__, status);
 	}
  
-	tty = tty_port_tty_get(&edge_port->port->port);
+	if (edge_port->open)
+		tty_port_tty_wakeup(&edge_port->port->port);
  
-	if (tty && edge_port->open) {
-		/* let the tty driver wakeup if it has a special
-		   write_wakeup function */
-		tty_wakeup(tty);
-	}
-	tty_kref_put(tty);
-
 	/* Release the Write URB */
 	edge_port->write_in_progress = false;
  
@@ -773,7 +760,6 @@
 static void edge_bulk_out_cmd_callback(struct urb *urb)
 {
 	struct edgeport_port *edge_port = urb->context;
-	struct tty_struct *tty;
 	int status = urb->status;
  
 	atomic_dec(&CmdUrbs);
  
@@ -794,13 +780,9 @@
 		return;
 	}
  
-	/* Get pointer to tty */
-	tty = tty_port_tty_get(&edge_port->port->port);
-
 	/* tell the tty driver that something has changed */
-	if (tty && edge_port->open)
-		tty_wakeup(tty);
-	tty_kref_put(tty);
+	if (edge_port->open)
+		tty_port_tty_wakeup(&edge_port->port->port);
  
 	/* we have completed the command */
 	edge_port->commandPending = false;
@@ -104,10 +104,8 @@
 	struct keyspan_pda_private *priv =
 		container_of(work, struct keyspan_pda_private, wakeup_work);
 	struct usb_serial_port *port = priv->port;
-	struct tty_struct *tty = tty_port_tty_get(&port->port);
-	if (tty)
-		tty_wakeup(tty);
-	tty_kref_put(tty);
+
+	tty_port_tty_wakeup(&port->port);
 }
  
 static void keyspan_pda_request_unthrottle(struct work_struct *work)
@@ -932,7 +932,6 @@
 static void mos7720_bulk_out_data_callback(struct urb *urb)
 {
 	struct moschip_port *mos7720_port;
-	struct tty_struct *tty;
 	int status = urb->status;
  
 	if (status) {
@@ -946,11 +945,8 @@
 		return ;
 	}
  
-	tty = tty_port_tty_get(&mos7720_port->port->port);
-
-	if (tty && mos7720_port->open)
-		tty_wakeup(tty);
-	tty_kref_put(tty);
+	if (mos7720_port->open)
+		tty_port_tty_wakeup(&mos7720_port->port->port);
 }
  
 /*
@@ -814,7 +814,6 @@
 {
 	struct moschip_port *mos7840_port;
 	struct usb_serial_port *port;
-	struct tty_struct *tty;
 	int status = urb->status;
 	int i;
  
@@ -837,10 +836,8 @@
 	if (mos7840_port_paranoia_check(port, __func__))
 		return;
  
-	tty = tty_port_tty_get(&port->port);
-	if (tty && mos7840_port->open)
-		tty_wakeup(tty);
-	tty_kref_put(tty);
+	if (mos7840_port->open)
+		tty_port_tty_wakeup(&port->port);
  
 }
  
@@ -1227,7 +1227,6 @@
 {
 	int count, result;
 	struct usb_serial_port *port = tport->tp_port;
-	struct tty_struct *tty = tty_port_tty_get(&port->port);	/* FIXME */
 	unsigned long flags;
  
 	spin_lock_irqsave(&tport->tp_lock, flags);
  
@@ -1268,14 +1267,12 @@
 	}
  
 	/* more room in the buffer for new writes, wakeup */
-	if (tty)
-		tty_wakeup(tty);
-	tty_kref_put(tty);
+	tty_port_tty_wakeup(&port->port);
+
 	wake_up_interruptible(&tport->tp_write_wait);
 	return;
 unlock:
 	spin_unlock_irqrestore(&tport->tp_lock, flags);
-	tty_kref_put(tty);
 	return;
 }
  
@@ -541,16 +541,8 @@
 {
 	struct usb_serial_port *port =
 		container_of(work, struct usb_serial_port, work);
-	struct tty_struct *tty;
  
-	tty = tty_port_tty_get(&port->port);
-	if (!tty)
-		return;
-
-	dev_dbg(tty->dev, "%s - port %d\n", __func__, port->number);
-
-	tty_wakeup(tty);
-	tty_kref_put(tty);
+	tty_port_tty_wakeup(&port->port);
 }
  
 static void kill_traffic(struct usb_serial_port *port)
@@ -534,6 +534,7 @@
 extern void tty_port_raise_dtr_rts(struct tty_port *port);
 extern void tty_port_lower_dtr_rts(struct tty_port *port);
 extern void tty_port_hangup(struct tty_port *port);
+extern void tty_port_tty_wakeup(struct tty_port *port);
 extern int tty_port_block_til_ready(struct tty_port *port,
 				struct tty_struct *tty, struct file *filp);
 extern int tty_port_close_start(struct tty_port *port,
...	...	@@ -248,7 +248,6 @@
248	248	{
249	249	struct chan *chan = data;
250	250	struct line *line = chan->line;
251		- struct tty_struct *tty;
252	251	int err;
253	252
254	253	/*
...	...	@@ -267,12 +266,7 @@
267	266	}
268	267	spin_unlock(&line->lock);
269	268
270		- tty = tty_port_tty_get(&line->port);
271		- if (tty == NULL)
272		- return IRQ_NONE;
273		-
274		- tty_wakeup(tty);
275		- tty_kref_put(tty);
	269	+ tty_port_tty_wakeup(&line->port);
276	270
277	271	return IRQ_HANDLED;
278	272	}
...	...	@@ -569,7 +569,6 @@
569	569	{
570	570	struct capidev *cdev = ap->private;
571	571	#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
572		- struct tty_struct *tty;
573	572	struct capiminor *mp;
574	573	u16 datahandle;
575	574	struct capincci *np;
...	...	@@ -627,11 +626,7 @@
627	626	CAPIMSG_U16(skb->data, CAPIMSG_BASELEN + 4 + 2));
628	627	kfree_skb(skb);
629	628	capiminor_del_ack(mp, datahandle);
630		- tty = tty_port_tty_get(&mp->port);
631		- if (tty) {
632		- tty_wakeup(tty);
633		- tty_kref_put(tty);
634		- }
	629	+ tty_port_tty_wakeup(&mp->port);
635	630	handle_minor_send(mp);
636	631
637	632	} else {
...	...	@@ -487,12 +487,8 @@
487	487	static void if_wake(unsigned long data)
488	488	{
489	489	struct cardstate cs = (struct cardstate )data;
490		- struct tty_struct *tty = tty_port_tty_get(&cs->port);
491	490
492		- if (tty) {
493		- tty_wakeup(tty);
494		- tty_kref_put(tty);
495		- }
	491	+ tty_port_tty_wakeup(&cs->port);
496	492	}
497	493
498	494	/* interface to common */
...	...	@@ -1925,7 +1925,6 @@
1925	1925	{
1926	1926	struct hso_serial *serial = urb->context;
1927	1927	int status = urb->status;
1928		- struct tty_struct *tty;
1929	1928
1930	1929	/* sanity check */
1931	1930	if (!serial) {
...	...	@@ -1941,11 +1940,7 @@
1941	1940	return;
1942	1941	}
1943	1942	hso_put_activity(serial->parent);
1944		- tty = tty_port_tty_get(&serial->port);
1945		- if (tty) {
1946		- tty_wakeup(tty);
1947		- tty_kref_put(tty);
1948		- }
	1943	+ tty_port_tty_wakeup(&serial->port);
1949	1944	hso_kick_transmit(serial);
1950	1945
1951	1946	D1(" ");
1952	1947
...	...	@@ -2008,12 +2003,8 @@
2008	2003	put_rxbuf_data_and_resubmit_ctrl_urb(serial);
2009	2004	spin_unlock(&serial->serial_lock);
2010	2005	} else {
2011		- struct tty_struct *tty = tty_port_tty_get(&serial->port);
2012	2006	hso_put_activity(serial->parent);
2013		- if (tty) {
2014		- tty_wakeup(tty);
2015		- tty_kref_put(tty);
2016		- }
	2007	+ tty_port_tty_wakeup(&serial->port);
2017	2008	/* response to a write command */
2018	2009	hso_kick_transmit(serial);
2019	2010	}
...	...	@@ -107,7 +107,6 @@
107	107	static void
108	108	sclp_ttybuf_callback(struct sclp_buffer *buffer, int rc)
109	109	{
110		- struct tty_struct *tty;
111	110	unsigned long flags;
112	111	void *page;
113	112
...	...	@@ -125,12 +124,8 @@
125	124	struct sclp_buffer, list);
126	125	spin_unlock_irqrestore(&sclp_tty_lock, flags);
127	126	} while (buffer && sclp_emit_buffer(buffer, sclp_ttybuf_callback));
128		- /* check if the tty needs a wake up call */
129		- tty = tty_port_tty_get(&sclp_port);
130		- if (tty != NULL) {
131		- tty_wakeup(tty);
132		- tty_kref_put(tty);
133		- }
	127	+
	128	+ tty_port_tty_wakeup(&sclp_port);
134	129	}
135	130
136	131	static inline void
...	...	@@ -114,7 +114,6 @@
114	114	static void
115	115	sclp_vt220_process_queue(struct sclp_vt220_request *request)
116	116	{
117		- struct tty_struct *tty;
118	117	unsigned long flags;
119	118	void *page;
120	119
...	...	@@ -139,12 +138,7 @@
139	138	} while (__sclp_vt220_emit(request));
140	139	if (request == NULL && sclp_vt220_flush_later)
141	140	sclp_vt220_emit_current();
142		- /* Check if the tty needs a wake up call */
143		- tty = tty_port_tty_get(&sclp_vt220_port);
144		- if (tty) {
145		- tty_wakeup(tty);
146		- tty_kref_put(tty);
147		- }
	141	+ tty_port_tty_wakeup(&sclp_vt220_port);
148	142	}
149	143
150	144	#define SCLP_BUFFER_MAX_RETRY 1
...	...	@@ -744,7 +744,6 @@
744	744	struct fwtty_transaction *txn)
745	745	{
746	746	struct fwtty_port *port = txn->port;
747		- struct tty_struct *tty;
748	747	int len;
749	748
750	749	fwtty_dbg(port, "rcode: %d", rcode);
...	...	@@ -769,13 +768,8 @@
769	768	port->stats.dropped += txn->dma_pended.len;
770	769	}
771	770
772		- if (len < WAKEUP_CHARS) {
773		- tty = tty_port_tty_get(&port->port);
774		- if (tty) {
775		- tty_wakeup(tty);
776		- tty_kref_put(tty);
777		- }
778		- }
	771	+ if (len < WAKEUP_CHARS)
	772	+ tty_port_tty_wakeup(&port->port);
779	773	}
780	774
781	775	static int fwtty_tx(struct fwtty_port *port, bool drain)
...	...	@@ -264,7 +264,6 @@
264	264
265	265	static void qt_write_bulk_callback(struct urb *urb)
266	266	{
267		- struct tty_struct *tty;
268	267	int status;
269	268	struct quatech_port *quatech_port;
270	269
...	...	@@ -278,11 +277,7 @@
278	277
279	278	quatech_port = urb->context;
280	279
281		- tty = tty_port_tty_get(&quatech_port->port->port);
282		-
283		- if (tty)
284		- tty_wakeup(tty);
285		- tty_kref_put(tty);
	280	+ tty_port_tty_wakeup(&quatech_port->port->port);
286	281	}
287	282
288	283	static void qt_interrupt_callback(struct urb *urb)
...	...	@@ -472,13 +472,9 @@
472	472	static irqreturn_t ehv_bc_tty_tx_isr(int irq, void *data)
473	473	{
474	474	struct ehv_bc_data *bc = data;
475		- struct tty_struct *ttys = tty_port_tty_get(&bc->port);
476	475
477	476	ehv_bc_tx_dequeue(bc);
478		- if (ttys) {
479		- tty_wakeup(ttys);
480		- tty_kref_put(ttys);
481		- }
	477	+ tty_port_tty_wakeup(&bc->port);
482	478
483	479	return IRQ_HANDLED;
484	480	}
...	...	@@ -861,7 +861,6 @@
861	861	{
862	862	struct hvsi_struct *hp =
863	863	container_of(work, struct hvsi_struct, writer.work);
864		- struct tty_struct *tty;
865	864	unsigned long flags;
866	865	#ifdef DEBUG
867	866	static long start_j = 0;
...	...	@@ -895,11 +894,7 @@
895	894	start_j = 0;
896	895	#endif /* DEBUG */
897	896	wake_up_all(&hp->emptyq);
898		- tty = tty_port_tty_get(&hp->port);
899		- if (tty) {
900		- tty_wakeup(tty);
901		- tty_kref_put(tty);
902		- }
	897	+ tty_port_tty_wakeup(&hp->port);
903	898	}
904	899
905	900	out: