Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1244002
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Peter Hurley <peter@hurleysoftware.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 3/7] usb: gadget: gserial: Privatize close_wait |
| Date | Sat, 10 Oct 2015 22:10:02 +0200 |
| Message-ID | <qi8CS-2S8-21@gated-at.bofh.it> (permalink) |
| References | <qi8CR-2S8-3@gated-at.bofh.it> |
| X-Original-To | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JGrT9FXOJyAUoHS7BBwe0JnHJEJ6soHUIhmhHUTuk5E=; b=AHFr0oXQzD6Jg9ctGuR2yg/Qb5EqardC+LHU5XmVBKsAS7QmMBPbPoO/S7waYRJzFl NBBFOuRhZpIZ5E0ejGrszBktQ/y+Az7JM4AfYyQ0KD7oMsDHKglvuvDiZ4eIehJCnsrV pDaSp/d5H333qK5ki+UVxypJG5sFuRXsVjpVICFWgVJLfiwGeqqB1N7J7opKl0W/YUfS hkrf83cHg5AgPw4q08dA/DVV0/Snl4FpV2Ec8Lb8vuikr/iVohbLWRJHK7IvSLTvpjr4 PJU4K5xeRmTk2G6jSaLNjglr0vBJQ6pOA5aiP2z9ucQIG1WhSc98fUhmoW5BydfvfAKg ksQQ== |
| X-Gm-Message-State | ALoCoQnntEa5+a+9DheZydzUOvZfGSM1ACptRzqhtHxdgCL+GRJjL+RC2iROndGBGXExgW7xzOIj |
| X-Received | by 10.140.19.49 with SMTP id 46mr6443840qgg.97.1444507285383; Sat, 10 Oct 2015 13:01:25 -0700 (PDT) |
| X-Mailer | git-send-email 2.6.1 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 54 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Jiri Slaby <jslaby@suse.cz>, Alan Cox <alan@linux.intel.com>, David Laight <David.Laight@aculab.com>, Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, netdev@vger.kernel.org, David Miller <davem@davemloft.net>, Peter Hurley <peter@hurleysoftware.com> |
| X-Original-Date | Sat, 10 Oct 2015 16:00:53 -0400 |
| X-Original-Message-ID | <1444507257-7513-4-git-send-email-peter@hurleysoftware.com> |
| X-Original-References | <1444507257-7513-1-git-send-email-peter@hurleysoftware.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1244002 |
Show key headers only | View raw
close_wait is no longer needed or provided by the tty core.
Move close_wait to struct gs_port.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/usb/gadget/function/u_serial.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index 7ee0579..42894f5 100644
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -114,6 +114,7 @@ struct gs_port {
struct gs_buf port_write_buf;
wait_queue_head_t drain_wait; /* wait while writes drain */
bool write_busy;
+ wait_queue_head_t close_wait;
/* REVISIT this state ... */
struct usb_cdc_line_coding port_line_coding; /* 8-N-1 etc */
@@ -884,7 +885,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
pr_debug("gs_close: ttyGS%d (%p,%p) done!\n",
port->port_num, tty, file);
- wake_up(&port->port.close_wait);
+ wake_up(&port->close_wait);
exit:
spin_unlock_irq(&port->port_lock);
}
@@ -1044,6 +1045,7 @@ gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding)
tty_port_init(&port->port);
spin_lock_init(&port->port_lock);
init_waitqueue_head(&port->drain_wait);
+ init_waitqueue_head(&port->close_wait);
tasklet_init(&port->push, gs_rx_push, (unsigned long) port);
@@ -1074,7 +1076,7 @@ static void gserial_free_port(struct gs_port *port)
{
tasklet_kill(&port->push);
/* wait for old opens to finish */
- wait_event(port->port.close_wait, gs_closed(port));
+ wait_event(port->close_wait, gs_closed(port));
WARN_ON(port->port_usb != NULL);
tty_port_destroy(&port->port);
kfree(port);
--
2.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH 3/7] usb: gadget: gserial: Privatize close_wait Peter Hurley <peter@hurleysoftware.com> - 2015-10-10 22:10 +0200 Re: [PATCH 3/7] usb: gadget: gserial: Privatize close_wait Peter Hurley <peter@hurleysoftware.com> - 2015-10-10 22:20 +0200
csiph-web