git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IB/ipath: Remove unused MDIO interface code
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ppp_synctty.c
diff --git
a/drivers/net/ppp_synctty.c
b/drivers/net/ppp_synctty.c
index
5918fab
..
f0c6a19
100644
(file)
--- a/
drivers/net/ppp_synctty.c
+++ b/
drivers/net/ppp_synctty.c
@@
-207,13
+207,12
@@
ppp_sync_open(struct tty_struct *tty)
struct syncppp *ap;
int err;
struct syncppp *ap;
int err;
- ap = k
m
alloc(sizeof(*ap), GFP_KERNEL);
+ ap = k
z
alloc(sizeof(*ap), GFP_KERNEL);
err = -ENOMEM;
err = -ENOMEM;
- if (
ap == 0
)
+ if (
!ap
)
goto out;
/* initialize the syncppp structure */
goto out;
/* initialize the syncppp structure */
- memset(ap, 0, sizeof(*ap));
ap->tty = tty;
ap->mru = PPP_MRU;
spin_lock_init(&ap->xmit_lock);
ap->tty = tty;
ap->mru = PPP_MRU;
spin_lock_init(&ap->xmit_lock);
@@
-263,7
+262,7
@@
ppp_sync_close(struct tty_struct *tty)
ap = tty->disc_data;
tty->disc_data = NULL;
write_unlock_irq(&disc_data_lock);
ap = tty->disc_data;
tty->disc_data = NULL;
write_unlock_irq(&disc_data_lock);
- if (
ap == 0
)
+ if (
!ap
)
return;
/*
return;
/*
@@
-279,7
+278,7
@@
ppp_sync_close(struct tty_struct *tty)
ppp_unregister_channel(&ap->chan);
skb_queue_purge(&ap->rqueue);
ppp_unregister_channel(&ap->chan);
skb_queue_purge(&ap->rqueue);
- if (ap->tpkt
!= 0
)
+ if (ap->tpkt)
kfree_skb(ap->tpkt);
kfree(ap);
}
kfree_skb(ap->tpkt);
kfree(ap);
}
@@
-326,13
+325,13
@@
ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
int __user *p = (int __user *)arg;
int err, val;
int __user *p = (int __user *)arg;
int err, val;
- if (
ap == 0
)
+ if (
!ap
)
return -ENXIO;
err = -EFAULT;
switch (cmd) {
case PPPIOCGCHAN:
err = -ENXIO;
return -ENXIO;
err = -EFAULT;
switch (cmd) {
case PPPIOCGCHAN:
err = -ENXIO;
- if (
ap == 0
)
+ if (
!ap
)
break;
err = -EFAULT;
if (put_user(ppp_channel_index(&ap->chan), p))
break;
err = -EFAULT;
if (put_user(ppp_channel_index(&ap->chan), p))
@@
-342,7
+341,7
@@
ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
case PPPIOCGUNIT:
err = -ENXIO;
case PPPIOCGUNIT:
err = -ENXIO;
- if (
ap == 0
)
+ if (
!ap
)
break;
err = -EFAULT;
if (put_user(ppp_unit_number(&ap->chan), p))
break;
err = -EFAULT;
if (put_user(ppp_unit_number(&ap->chan), p))
@@
-350,16
+349,11
@@
ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
err = 0;
break;
err = 0;
break;
- case TCGETS:
- case TCGETA:
- err = n_tty_ioctl(tty, file, cmd, arg);
- break;
-
case TCFLSH:
/* flush our buffers and the serial port's buffer */
if (arg == TCIOFLUSH || arg == TCOFLUSH)
ppp_sync_flush_output(ap);
case TCFLSH:
/* flush our buffers and the serial port's buffer */
if (arg == TCIOFLUSH || arg == TCOFLUSH)
ppp_sync_flush_output(ap);
- err =
n_tty_ioctl(tty, file, cmd
, arg);
+ err =
tty_perform_flush(tty
, arg);
break;
case FIONREAD:
break;
case FIONREAD:
@@
-370,7
+364,8
@@
ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
break;
default:
break;
default:
- err = -ENOIOCTLCMD;
+ err = tty_mode_ioctl(tty, file, cmd, arg);
+ break;
}
sp_put(ap);
}
sp_put(ap);
@@
-395,7
+390,7
@@
ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf,
struct syncppp *ap = sp_get(tty);
unsigned long flags;
struct syncppp *ap = sp_get(tty);
unsigned long flags;
- if (
ap == 0
)
+ if (
!ap
)
return;
spin_lock_irqsave(&ap->recv_lock, flags);
ppp_sync_input(ap, buf, cflags, count);
return;
spin_lock_irqsave(&ap->recv_lock, flags);
ppp_sync_input(ap, buf, cflags, count);
@@
-414,7
+409,7
@@
ppp_sync_wakeup(struct tty_struct *tty)
struct syncppp *ap = sp_get(tty);
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
struct syncppp *ap = sp_get(tty);
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
- if (
ap == 0
)
+ if (
!ap
)
return;
set_bit(XMIT_WAKEUP, &ap->xmit_flags);
tasklet_schedule(&ap->tsk);
return;
set_bit(XMIT_WAKEUP, &ap->xmit_flags);
tasklet_schedule(&ap->tsk);
@@
-656,7
+651,7
@@
ppp_sync_push(struct syncppp *ap)
for (;;) {
if (test_and_clear_bit(XMIT_WAKEUP, &ap->xmit_flags))
tty_stuffed = 0;
for (;;) {
if (test_and_clear_bit(XMIT_WAKEUP, &ap->xmit_flags))
tty_stuffed = 0;
- if (!tty_stuffed && ap->tpkt
!= 0
) {
+ if (!tty_stuffed && ap->tpkt) {
set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
sent = tty->driver->write(tty, ap->tpkt->data, ap->tpkt->len);
if (sent < 0)
set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
sent = tty->driver->write(tty, ap->tpkt->data, ap->tpkt->len);
if (sent < 0)
@@
-674,7
+669,7
@@
ppp_sync_push(struct syncppp *ap)
/* haven't made any progress */
spin_unlock_bh(&ap->xmit_lock);
if (!(test_bit(XMIT_WAKEUP, &ap->xmit_flags)
/* haven't made any progress */
spin_unlock_bh(&ap->xmit_lock);
if (!(test_bit(XMIT_WAKEUP, &ap->xmit_flags)
- || (!tty_stuffed && ap->tpkt
!= 0
)))
+ || (!tty_stuffed && ap->tpkt)))
break;
if (!spin_trylock_bh(&ap->xmit_lock))
break;
break;
if (!spin_trylock_bh(&ap->xmit_lock))
break;
@@
-682,7
+677,7
@@
ppp_sync_push(struct syncppp *ap)
return done;
flush:
return done;
flush:
- if (ap->tpkt
!= 0
) {
+ if (ap->tpkt) {
kfree_skb(ap->tpkt);
ap->tpkt = NULL;
clear_bit(XMIT_FULL, &ap->xmit_flags);
kfree_skb(ap->tpkt);
ap->tpkt = NULL;
clear_bit(XMIT_FULL, &ap->xmit_flags);
@@
-737,7
+732,8
@@
ppp_sync_input(struct syncppp *ap, const unsigned char *buf,
ppp_print_buffer ("receive buffer", buf, count);
/* stuff the chars in the skb */
ppp_print_buffer ("receive buffer", buf, count);
/* stuff the chars in the skb */
- if ((skb = dev_alloc_skb(ap->mru + PPP_HDRLEN + 2)) == 0) {
+ skb = dev_alloc_skb(ap->mru + PPP_HDRLEN + 2);
+ if (!skb) {
printk(KERN_ERR "PPPsync: no memory (input pkt)\n");
goto err;
}
printk(KERN_ERR "PPPsync: no memory (input pkt)\n");
goto err;
}
@@
-745,7
+741,7
@@
ppp_sync_input(struct syncppp *ap, const unsigned char *buf,
if (buf[0] != PPP_ALLSTATIONS)
skb_reserve(skb, 2 + (buf[0] & 1));
if (buf[0] != PPP_ALLSTATIONS)
skb_reserve(skb, 2 + (buf[0] & 1));
- if (flags
!= 0
&& *flags) {
+ if (flags && *flags) {
/* error flag set, ignore frame */
goto err;
} else if (count > skb_tailroom(skb)) {
/* error flag set, ignore frame */
goto err;
} else if (count > skb_tailroom(skb)) {