Commit 47652ae9 authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by David S. Miller

[IRDA]: cleanup obsolete construct in IrCOMM

cleanup some construct obsoleted by Linus's patch
Signed-off-by: default avatarJean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7680d6fd
...@@ -671,10 +671,9 @@ static void ircomm_tty_do_softint(void *private_) ...@@ -671,10 +671,9 @@ static void ircomm_tty_do_softint(void *private_)
* accepted for writing. This routine is mandatory. * accepted for writing. This routine is mandatory.
*/ */
static int ircomm_tty_write(struct tty_struct *tty, static int ircomm_tty_write(struct tty_struct *tty,
const unsigned char *ubuf, int count) const unsigned char *buf, int count)
{ {
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
unsigned char *kbuf; /* Buffer in kernel space */
unsigned long flags; unsigned long flags;
struct sk_buff *skb; struct sk_buff *skb;
int tailroom = 0; int tailroom = 0;
...@@ -714,9 +713,6 @@ static int ircomm_tty_write(struct tty_struct *tty, ...@@ -714,9 +713,6 @@ static int ircomm_tty_write(struct tty_struct *tty,
if (count < 1) if (count < 1)
return 0; return 0;
/* The buffer is already in kernel space */
kbuf = (unsigned char *) ubuf;
/* Protect our manipulation of self->tx_skb and related */ /* Protect our manipulation of self->tx_skb and related */
spin_lock_irqsave(&self->spinlock, flags); spin_lock_irqsave(&self->spinlock, flags);
...@@ -779,7 +775,7 @@ static int ircomm_tty_write(struct tty_struct *tty, ...@@ -779,7 +775,7 @@ static int ircomm_tty_write(struct tty_struct *tty,
} }
/* Copy data */ /* Copy data */
memcpy(skb_put(skb,size), kbuf + len, size); memcpy(skb_put(skb,size), buf + len, size);
count -= size; count -= size;
len += size; len += size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment