Messages in this thread Patch in this message | | | Date | Wed, 4 Jun 2008 08:59:49 -0700 (PDT) | From | Linus Torvalds <> | Subject | Re: [PATCH] serial_core: uart_set_ldisc (Was Re: Blackfin Serial Driver: Enable IR function when user application (irattach /dev/ttyBFx -s) call TIOCSETD ioctl with line discipline N_IRDA) |
| |
On Tue, 3 Jun 2008, Alan Cox wrote: > > Linus: This change plus a follow up from the Blackfin guys is needed to > avoid blackfin losing features in this release.
Alan, I applied this as "obviously safe", since nobody sets the uart-level set_ldisc thing yet... BUT!
I now get an annoying compiler warning, and the compiler is definitely right. You have:
static void uart_set_ldisc(struct tty_struct *tty, int ldisc) .. .set_ldisc = uart_set_ldisc,
Oops. Totally wrong function type. Because the tty-level one is
void (*set_ldisc)(struct tty_struct *tty);
in my tree, and as a result I suspect you sent me the wrong version of a patch (perhaps based on -mm or -next).
I assume I should just remove the (unused) "int ldisc" argument, but would like to get confirmation first.
Linus
-- drivers/serial/serial_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index 951a75e..c9b64e7 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c @@ -1165,7 +1165,7 @@ out: return ret; } -static void uart_set_ldisc(struct tty_struct *tty, int ldisc) +static void uart_set_ldisc(struct tty_struct *tty) { struct uart_state *state = tty->driver_data; struct uart_port *port = state->port;
| |