* linux-next: manual merge of the usb tree with the tty tree
@ 2013-03-26 3:49 Stephen Rothwell
2013-03-26 21:29 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2013-03-26 3:49 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jiri Slaby, Johan Hovold
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/usb-serial.c between commit 6aad04f21374 ("TTY: add
tty_port_tty_wakeup helper") from the tty tree and commit d12e211d4484
("USB: serial: clean up debug info") from the usb tree.
I fixed it up (I just used the version of usb_serial_port_work() from the
tty tree - see below) and can carry the fix as necessary (no action is
required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/usb-serial.c
index 2f60474,5eb96df..0000000
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@@ -542,11 -538,19 +538,11 @@@ static void usb_serial_port_work(struc
{
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\n", __func__);
-
- tty_wakeup(tty);
- tty_kref_put(tty);
+ tty_port_tty_wakeup(&port->port);
}
- static void kill_traffic(struct usb_serial_port *port)
+ static void usb_serial_port_poison_urbs(struct usb_serial_port *port)
{
int i;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the usb tree with the tty tree
2013-03-26 3:49 linux-next: manual merge of the usb tree with the tty tree Stephen Rothwell
@ 2013-03-26 21:29 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2013-03-26 21:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jiri Slaby, Johan Hovold
On Tue, Mar 26, 2013 at 02:49:32PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/usb-serial.c between commit 6aad04f21374 ("TTY: add
> tty_port_tty_wakeup helper") from the tty tree and commit d12e211d4484
> ("USB: serial: clean up debug info") from the usb tree.
>
> I fixed it up (I just used the version of usb_serial_port_work() from the
> tty tree - see below) and can carry the fix as necessary (no action is
> required).
Looks correct, thanks.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the usb tree with the tty tree
2013-01-28 10:13 Stephen Rothwell
@ 2013-01-28 14:45 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2013-01-28 14:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Joe Millenbach,
Sebastian Andrzej Siewior, Felipe Balbi
On Mon, Jan 28, 2013 at 09:13:07PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/gadget/Kconfig between commit 4f73bc4dd3e8 ("tty: Added a
> CONFIG_TTY option to allow removal of TTY") from the tty tree and commit
> 3249ca22c088 ("usb: gadget: u_serial: convert into a module") from the
> usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/usb/gadget/Kconfig
> index a1bd951,6665d25..0000000
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@@ -750,7 -760,8 +760,9 @@@ config USB_GADGET_TARGE
>
> config USB_G_SERIAL
> tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
> + depends on TTY
> + select USB_U_SERIAL
> + select USB_F_ACM
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the usb tree with the tty tree
@ 2013-01-28 10:13 Stephen Rothwell
2013-01-28 14:45 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2013-01-28 10:13 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Joe Millenbach,
Sebastian Andrzej Siewior, Felipe Balbi
[-- Attachment #1: Type: text/plain, Size: 921 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/Kconfig between commit 4f73bc4dd3e8 ("tty: Added a
CONFIG_TTY option to allow removal of TTY") from the tty tree and commit
3249ca22c088 ("usb: gadget: u_serial: convert into a module") from the
usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/gadget/Kconfig
index a1bd951,6665d25..0000000
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@@ -750,7 -760,8 +760,9 @@@ config USB_GADGET_TARGE
config USB_G_SERIAL
tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
+ depends on TTY
+ select USB_U_SERIAL
+ select USB_F_ACM
select USB_LIBCOMPOSITE
help
The Serial Gadget talks to the Linux-USB generic serial driver.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the usb tree with the tty tree
2012-09-19 4:16 Stephen Rothwell
@ 2012-09-19 7:17 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2012-09-19 7:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Alan Cox
On Wed, Sep 19, 2012 at 02:16:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/io_edgeport.c between commit adc8d746caa6 ("tty: move
> the termios object into the tty") from the tty tree and commit
> 984f68683298 ("USB: serial: io_edgeport.c: remove dbg() usage") from the
> usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks correct to me, thanks for the fix.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the usb tree with the tty tree
@ 2012-09-19 4:16 Stephen Rothwell
2012-09-19 7:17 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2012-09-19 4:16 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 1508 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/io_edgeport.c between commit adc8d746caa6 ("tty: move
the termios object into the tty") from the tty tree and commit
984f68683298 ("USB: serial: io_edgeport.c: remove dbg() usage") from the
usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/io_edgeport.c
index f435575,75b7ccd..0000000
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@@ -1516,13 -1497,9 +1497,9 @@@ static void edge_set_termios(struct tty
struct edgeport_port *edge_port = usb_get_serial_port_data(port);
unsigned int cflag;
- cflag = tty->termios->c_cflag;
- dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__, tty->termios->c_cflag, tty->termios->c_iflag);
+ cflag = tty->termios.c_cflag;
- dbg("%s - clfag %08x iflag %08x", __func__,
- tty->termios.c_cflag, tty->termios.c_iflag);
- dbg("%s - old clfag %08x old iflag %08x", __func__,
- old_termios->c_cflag, old_termios->c_iflag);
-
- dbg("%s - port %d", __func__, port->number);
++ dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__, tty->termios.c_cflag, tty->termios.c_iflag);
+ dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__, old_termios->c_cflag, old_termios->c_iflag);
if (edge_port == NULL)
return;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the usb tree with the tty tree
2012-09-17 7:31 Stephen Rothwell
@ 2012-09-17 11:20 ` Greg KH
0 siblings, 0 replies; 12+ messages in thread
From: Greg KH @ 2012-09-17 11:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Alan Cox
On Mon, Sep 17, 2012 at 05:31:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/digi_acceleport.c between commit adc8d746caa6 ("tty:
> move the termios object into the tty") from the tty tree and commit
> f9dfbebb8b39 ("USB: serial: digi_acceleport.c: remove dbg() usage") from
> the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
This fix, and the other usb->tty tree issues, all look good to me,
thanks for doing them, and sorry for the problems.
greg k-h
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the usb tree with the tty tree
@ 2012-09-17 7:31 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2012-09-17 7:31 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/digi_acceleport.c between commit adc8d746caa6 ("tty:
move the termios object into the tty") from the tty tree and commit
f9dfbebb8b39 ("USB: serial: digi_acceleport.c: remove dbg() usage") from
the usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/digi_acceleport.c
index afd9d2e,d3a8941..0000000
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@@ -687,8 -685,9 +685,9 @@@ static void digi_set_termios(struct tty
struct usb_serial_port *port, struct ktermios *old_termios)
{
struct digi_port *priv = usb_get_serial_port_data(port);
+ struct device *dev = &port->dev;
- unsigned int iflag = tty->termios->c_iflag;
- unsigned int cflag = tty->termios->c_cflag;
+ unsigned int iflag = tty->termios.c_iflag;
+ unsigned int cflag = tty->termios.c_cflag;
unsigned int old_iflag = old_termios->c_iflag;
unsigned int old_cflag = old_termios->c_cflag;
unsigned char buf[32];
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the usb tree with the tty tree
@ 2012-09-17 7:31 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-09-17 7:31 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 2561 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/io_ti.c between commit adc8d746caa6 ("tty: move the
termios object into the tty") from the tty tree and commit 67e6da702753
("USB: serial: io_ti.c: remove dbg() usage") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/io_ti.c
index 765978a,54916d7..0000000
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@@ -2272,9 -2224,8 +2224,8 @@@ static void change_port_settings(struc
config = kmalloc (sizeof (*config), GFP_KERNEL);
if (!config) {
- *tty->termios = *old_termios;
+ tty->termios = *old_termios;
- dev_err(&edge_port->port->dev, "%s - out of memory\n",
- __func__);
+ dev_err(dev, "%s - out of memory\n", __func__);
return;
}
@@@ -2357,12 -2308,12 +2308,12 @@@
/* if we are implementing OUTBOUND XON/XOFF */
if (I_IXON(tty)) {
config->wFlags |= UMP_MASK_UART_FLAGS_OUT_X;
- dbg("%s - OUTBOUND XON/XOFF is enabled, XON = %2x, XOFF = %2x",
- __func__, config->cXon, config->cXoff);
+ dev_dbg(dev, "%s - OUTBOUND XON/XOFF is enabled, XON = %2x, XOFF = %2x\n",
+ __func__, config->cXon, config->cXoff);
} else
- dbg("%s - OUTBOUND XON/XOFF is disabled", __func__);
+ dev_dbg(dev, "%s - OUTBOUND XON/XOFF is disabled\n", __func__);
- tty->termios->c_cflag &= ~CMSPAR;
+ tty->termios.c_cflag &= ~CMSPAR;
/* Round the baud rate */
baud = tty_get_baud_rate(tty);
@@@ -2408,13 -2358,13 +2358,13 @@@ static void edge_set_termios(struct tty
struct edgeport_port *edge_port = usb_get_serial_port_data(port);
unsigned int cflag;
- cflag = tty->termios->c_cflag;
+ cflag = tty->termios.c_cflag;
- dbg("%s - clfag %08x iflag %08x", __func__,
- tty->termios.c_cflag, tty->termios.c_iflag);
- dbg("%s - old clfag %08x old iflag %08x", __func__,
- old_termios->c_cflag, old_termios->c_iflag);
- dbg("%s - port %d", __func__, port->number);
+ dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__,
- tty->termios->c_cflag, tty->termios->c_iflag);
++ tty->termios.c_cflag, tty->termios.c_iflag);
+ dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__,
+ old_termios->c_cflag, old_termios->c_iflag);
+ dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
if (edge_port == NULL)
return;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the usb tree with the tty tree
@ 2012-09-17 7:31 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-09-17 7:31 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/kl5kusb105.c between commit adc8d746caa6 ("tty: move
the termios object into the tty") from the tty tree and commit
1ad7604f69ae ("USB: serial: kl5kusb105.c: remove dbg() usage") from the
usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/kl5kusb105.c
index def9ad2,e4aa6c0..0000000
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@@ -445,9 -445,10 +445,10 @@@ static void klsi_105_set_termios(struc
struct ktermios *old_termios)
{
struct klsi_105_private *priv = usb_get_serial_port_data(port);
+ struct device *dev = &port->dev;
- unsigned int iflag = tty->termios->c_iflag;
+ unsigned int iflag = tty->termios.c_iflag;
unsigned int old_iflag = old_termios->c_iflag;
- unsigned int cflag = tty->termios->c_cflag;
+ unsigned int cflag = tty->termios.c_cflag;
unsigned int old_cflag = old_termios->c_cflag;
struct klsi_105_port_settings *cfg;
unsigned long flags;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the usb tree with the tty tree
@ 2012-09-17 7:30 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-09-17 7:30 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/mos7720.c between commit adc8d746caa6 ("tty: move the
termios object into the tty") from the tty tree and commit 9eecf8085473
("USB: serial: mos7720.c: remove dbg() usage") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/mos7720.c
index 012f67b,192191c..0000000
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@@ -1751,19 -1708,15 +1708,15 @@@ static void mos7720_set_termios(struct
return;
}
- dbg("%s\n", "setting termios - ASPIRE");
+ dev_dbg(&port->dev, "setting termios - ASPIRE\n");
- cflag = tty->termios->c_cflag;
+ cflag = tty->termios.c_cflag;
- dbg("%s - cflag %08x iflag %08x", __func__,
- tty->termios.c_cflag,
- RELEVANT_IFLAG(tty->termios.c_iflag));
+ dev_dbg(&port->dev, "%s - cflag %08x iflag %08x\n", __func__,
- tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag));
++ tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));
- dbg("%s - old cflag %08x old iflag %08x", __func__,
- old_termios->c_cflag,
- RELEVANT_IFLAG(old_termios->c_iflag));
-
- dbg("%s - port %d", __func__, port->number);
+ dev_dbg(&port->dev, "%s - old cflag %08x old iflag %08x\n", __func__,
+ old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
/* change the port settings to the new ones specified */
change_port_settings(tty, mos7720_port, old_termios);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the usb tree with the tty tree
@ 2012-09-17 7:30 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-09-17 7:30 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/mos7840.c between commit adc8d746caa6 ("tty: move the
termios object into the tty") from the tty tree and commit 9c134a14f2da
("USB: serial: mos7840.c: remove dbg() usage") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/mos7840.c
index 402c32d,ffbe4ee..0000000
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@@ -2159,15 -2086,15 +2086,15 @@@ static void mos7840_set_termios(struct
return;
}
- dbg("%s", "setting termios - ");
+ dev_dbg(&port->dev, "%s", "setting termios - \n");
- cflag = tty->termios->c_cflag;
+ cflag = tty->termios.c_cflag;
- dbg("%s - clfag %08x iflag %08x", __func__,
- tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));
- dbg("%s - old clfag %08x old iflag %08x", __func__,
- old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
- dbg("%s - port %d", __func__, port->number);
+ dev_dbg(&port->dev, "%s - clfag %08x iflag %08x\n", __func__,
- tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag));
++ tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));
+ dev_dbg(&port->dev, "%s - old clfag %08x old iflag %08x\n", __func__,
+ old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
+ dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
/* change the port settings to the new ones specified */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2013-03-26 21:29 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-26 3:49 linux-next: manual merge of the usb tree with the tty tree Stephen Rothwell
2013-03-26 21:29 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2013-01-28 10:13 Stephen Rothwell
2013-01-28 14:45 ` Greg KH
2012-09-19 4:16 Stephen Rothwell
2012-09-19 7:17 ` Greg KH
2012-09-17 7:31 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
2012-09-17 7:31 Stephen Rothwell
2012-09-17 7:31 Stephen Rothwell
2012-09-17 7:30 Stephen Rothwell
2012-09-17 7:30 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).