[PPP]: Remove ptr comparisons to 0

fix sparse warnings "Using plain integer as NULL pointer"

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 63 insertions, 63 deletions

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 4b49d0e8c7eb..4f690378bb77 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -367,7 +367,7 @@ static int ppp_release(struct inode *inode, struct file *file)
         struct ppp_file *pf = file->private_data;
         struct ppp *ppp;
 
-        if (pf != 0) {
+        if (pf) {
                 file->private_data = NULL;
                 if (pf->kind == INTERFACE) {
                         ppp = PF_TO_PPP(pf);
@@ -398,7 +398,7 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
 
         ret = count;
 
-        if (pf == 0)
+        if (!pf)
                 return -ENXIO;
         add_wait_queue(&pf->rwait, &wait);
         for (;;) {
@@ -431,7 +431,7 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
         set_current_state(TASK_RUNNING);
         remove_wait_queue(&pf->rwait, &wait);
 
-        if (skb == 0)
+        if (!skb)
                 goto out;
 
         ret = -EOVERFLOW;
@@ -455,11 +455,11 @@ static ssize_t ppp_write(struct file *file, const char __user *buf,
         struct sk_buff *skb;
         ssize_t ret;
 
-        if (pf == 0)
+        if (!pf)
                 return -ENXIO;
         ret = -ENOMEM;
         skb = alloc_skb(count + pf->hdrlen, GFP_KERNEL);
-        if (skb == 0)
+        if (!skb)
                 goto out;
         skb_reserve(skb, pf->hdrlen);
         ret = -EFAULT;
@@ -491,11 +491,11 @@ static unsigned int ppp_poll(struct file *file, poll_table *wait)
         struct ppp_file *pf = file->private_data;
         unsigned int mask;
 
-        if (pf == 0)
+        if (!pf)
                 return 0;
         poll_wait(file, &pf->rwait, wait);
         mask = POLLOUT | POLLWRNORM;
-        if (skb_peek(&pf->rq) != 0)
+        if (skb_peek(&pf->rq))
                 mask |= POLLIN | POLLRDNORM;
         if (pf->dead)
                 mask |= POLLHUP;
@@ -559,7 +559,7 @@ static int ppp_ioctl(struct inode *inode, struct file *file,
         void __user *argp = (void __user *)arg;
         int __user *p = argp;
 
-        if (pf == 0)
+        if (!pf)
                 return ppp_unattached_ioctl(pf, file, cmd, arg);
 
         if (cmd == PPPIOCDETACH) {
@@ -689,13 +689,13 @@ static int ppp_ioctl(struct inode *inode, struct file *file,
                         val &= 0xffff;
                 }
                 vj = slhc_init(val2+1, val+1);
-                if (vj == 0) {
+                if (!vj) {
                         printk(KERN_ERR "PPP: no memory (VJ compressor)\n");
                         err = -ENOMEM;
                         break;
                 }
                 ppp_lock(ppp);
-                if (ppp->vj != 0)
+                if (ppp->vj)
                         slhc_free(ppp->vj);
                 ppp->vj = vj;
                 ppp_unlock(ppp);
@@ -786,7 +786,7 @@ static int ppp_unattached_ioctl(struct ppp_file *pf, struct file *file,
                 if (get_user(unit, p))
                         break;
                 ppp = ppp_create_interface(unit, &err);
-                if (ppp == 0)
+                if (!ppp)
                         break;
                 file->private_data = &ppp->file;
                 ppp->owner = file;
@@ -803,7 +803,7 @@ static int ppp_unattached_ioctl(struct ppp_file *pf, struct file *file,
                 mutex_lock(&all_ppp_mutex);
                 err = -ENXIO;
                 ppp = ppp_find_unit(unit);
-                if (ppp != 0) {
+                if (ppp) {
                         atomic_inc(&ppp->file.refcnt);
                         file->private_data = &ppp->file;
                         err = 0;
@@ -817,7 +817,7 @@ static int ppp_unattached_ioctl(struct ppp_file *pf, struct file *file,
                 spin_lock_bh(&all_channels_lock);
                 err = -ENXIO;
                 chan = ppp_find_channel(unit);
-                if (chan != 0) {
+                if (chan) {
                         atomic_inc(&chan->file.refcnt);
                         file->private_data = &chan->file;
                         err = 0;
@@ -946,9 +946,9 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
         case SIOCGPPPCSTATS:
                 memset(&cstats, 0, sizeof(cstats));
-                if (ppp->xc_state != 0)
+                if (ppp->xc_state)
                         ppp->xcomp->comp_stat(ppp->xc_state, &cstats.c);
-                if (ppp->rc_state != 0)
+                if (ppp->rc_state)
                         ppp->rcomp->decomp_stat(ppp->rc_state, &cstats.d);
                 if (copy_to_user(addr, &cstats, sizeof(cstats)))
                         break;
@@ -993,14 +993,14 @@ ppp_xmit_process(struct ppp *ppp)
         struct sk_buff *skb;
 
         ppp_xmit_lock(ppp);
-        if (ppp->dev != 0) {
+        if (ppp->dev) {
                 ppp_push(ppp);
-                while (ppp->xmit_pending == 0
-                       && (skb = skb_dequeue(&ppp->file.xq)) != 0)
+                while (!ppp->xmit_pending
+                       && (skb = skb_dequeue(&ppp->file.xq)))
                         ppp_send_frame(ppp, skb);
                 /* If there's no work left to do, tell the core net
                    code that we can accept some more. */
-                if (ppp->xmit_pending == 0 && skb_peek(&ppp->file.xq) == 0)
+                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq))
                         netif_wake_queue(ppp->dev);
         }
         ppp_xmit_unlock(ppp);
@@ -1100,12 +1100,12 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
 
         switch (proto) {
         case PPP_IP:
-                if (ppp->vj == 0 || (ppp->flags & SC_COMP_TCP) == 0)
+                if (!ppp->vj || (ppp->flags & SC_COMP_TCP) == 0)
                         break;
                 /* try to do VJ TCP header compression */
                 new_skb = alloc_skb(skb->len + ppp->dev->hard_header_len - 2,
                                     GFP_ATOMIC);
-                if (new_skb == 0) {
+                if (!new_skb) {
                         printk(KERN_ERR "PPP: no memory (VJ comp pkt)\n");
                         goto drop;
                 }
@@ -1140,7 +1140,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
         }
 
         /* try to do packet compression */
-        if ((ppp->xstate & SC_COMP_RUN) && ppp->xc_state != 0
+        if ((ppp->xstate & SC_COMP_RUN) && ppp->xc_state
             && proto != PPP_LCP && proto != PPP_CCP) {
                 if (!(ppp->flags & SC_CCP_UP) && (ppp->flags & SC_MUST_COMP)) {
                         if (net_ratelimit())
@@ -1185,7 +1185,7 @@ ppp_push(struct ppp *ppp)
         struct channel *pch;
         struct sk_buff *skb = ppp->xmit_pending;
 
-        if (skb == 0)
+        if (!skb)
                 return;
 
         list = &ppp->channels;
@@ -1355,7 +1355,7 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
                 if (flen == len && nfree == 0)
                         bits |= E;
                 frag = alloc_skb(flen + hdrlen + (flen == 0), GFP_ATOMIC);
-                if (frag == 0)
+                if (!frag)
                         goto noskb;
                 q = skb_put(frag, flen + hdrlen);
 
@@ -1425,7 +1425,7 @@ ppp_channel_push(struct channel *pch)
         struct ppp *ppp;
 
         spin_lock_bh(&pch->downl);
-        if (pch->chan != 0) {
+        if (pch->chan) {
                 while (!skb_queue_empty(&pch->file.xq)) {
                         skb = skb_dequeue(&pch->file.xq);
                         if (!pch->chan->ops->start_xmit(pch->chan, skb)) {
@@ -1443,7 +1443,7 @@ ppp_channel_push(struct channel *pch)
         if (skb_queue_empty(&pch->file.xq)) {
                 read_lock_bh(&pch->upl);
                 ppp = pch->ppp;
-                if (ppp != 0)
+                if (ppp)
                         ppp_xmit_process(ppp);
                 read_unlock_bh(&pch->upl);
         }
@@ -1462,7 +1462,7 @@ ppp_do_recv(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
 {
         ppp_recv_lock(ppp);
         /* ppp->dev == 0 means interface is closing down */
-        if (ppp->dev != 0)
+        if (ppp->dev)
                 ppp_receive_frame(ppp, skb, pch);
         else
                 kfree_skb(skb);
@@ -1475,19 +1475,19 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb)
         struct channel *pch = chan->ppp;
         int proto;
 
-        if (pch == 0 || skb->len == 0) {
+        if (!pch || skb->len == 0) {
                 kfree_skb(skb);
                 return;
         }
 
         proto = PPP_PROTO(skb);
         read_lock_bh(&pch->upl);
-        if (pch->ppp == 0 || proto >= 0xc000 || proto == PPP_CCPFRAG) {
+        if (!pch->ppp || proto >= 0xc000 || proto == PPP_CCPFRAG) {
                 /* put it on the channel queue */
                 skb_queue_tail(&pch->file.rq, skb);
                 /* drop old frames if queue too long */
                 while (pch->file.rq.qlen > PPP_MAX_RQLEN
-                       && (skb = skb_dequeue(&pch->file.rq)) != 0)
+                       && (skb = skb_dequeue(&pch->file.rq)))
                         kfree_skb(skb);
                 wake_up_interruptible(&pch->file.rwait);
         } else {
@@ -1503,13 +1503,13 @@ ppp_input_error(struct ppp_channel *chan, int code)
         struct channel *pch = chan->ppp;
         struct sk_buff *skb;
 
-        if (pch == 0)
+        if (!pch)
                 return;
 
         read_lock_bh(&pch->upl);
-        if (pch->ppp != 0) {
+        if (pch->ppp) {
                 skb = alloc_skb(0, GFP_ATOMIC);
-                if (skb != 0) {
+                if (skb) {
                         skb->len = 0;           /* probably unnecessary */
                         skb->cb[0] = code;
                         ppp_do_recv(pch->ppp, skb, pch);
@@ -1548,7 +1548,7 @@ static void
 ppp_receive_error(struct ppp *ppp)
 {
         ++ppp->stats.rx_errors;
-        if (ppp->vj != 0)
+        if (ppp->vj)
                 slhc_toss(ppp->vj);
 }
 
@@ -1563,7 +1563,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
          * Note that some decompressors need to see uncompressed frames
          * that come in as well as compressed frames.
          */
-        if (ppp->rc_state != 0 && (ppp->rstate & SC_DECOMP_RUN)
+        if (ppp->rc_state && (ppp->rstate & SC_DECOMP_RUN)
             && (ppp->rstate & (SC_DC_FERROR | SC_DC_ERROR)) == 0)
                 skb = ppp_decompress_frame(ppp, skb);
 
@@ -1574,13 +1574,13 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
         switch (proto) {
         case PPP_VJC_COMP:
                 /* decompress VJ compressed packets */
-                if (ppp->vj == 0 || (ppp->flags & SC_REJ_COMP_TCP))
+                if (!ppp->vj || (ppp->flags & SC_REJ_COMP_TCP))
                         goto err;
 
                 if (skb_tailroom(skb) < 124 || skb_cloned(skb)) {
                         /* copy to a new sk_buff with more tailroom */
                         ns = dev_alloc_skb(skb->len + 128);
-                        if (ns == 0) {
+                        if (!ns) {
                                 printk(KERN_ERR"PPP: no memory (VJ decomp)\n");
                                 goto err;
                         }
@@ -1606,7 +1606,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                 break;
 
         case PPP_VJC_UNCOMP:
-                if (ppp->vj == 0 || (ppp->flags & SC_REJ_COMP_TCP))
+                if (!ppp->vj || (ppp->flags & SC_REJ_COMP_TCP))
                         goto err;
 
                 /* Until we fix the decompressor need to make sure
@@ -1636,7 +1636,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                 skb_queue_tail(&ppp->file.rq, skb);
                 /* limit queue length by dropping old frames */
                 while (ppp->file.rq.qlen > PPP_MAX_RQLEN
-                       && (skb = skb_dequeue(&ppp->file.rq)) != 0)
+                       && (skb = skb_dequeue(&ppp->file.rq)))
                         kfree_skb(skb);
                 /* wake up any process polling or blocking on read */
                 wake_up_interruptible(&ppp->file.rwait);
@@ -1718,7 +1718,7 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb)
                 }
 
                 ns = dev_alloc_skb(obuff_size);
-                if (ns == 0) {
+                if (!ns) {
                         printk(KERN_ERR "ppp_decompress_frame: no memory\n");
                         goto err;
                 }
@@ -1836,7 +1836,7 @@ ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
                 ppp->minseq = ppp->mrq.next->sequence;
 
         /* Pull completed packets off the queue and receive them. */
-        while ((skb = ppp_mp_reconstruct(ppp)) != 0)
+        while ((skb = ppp_mp_reconstruct(ppp)))
                 ppp_receive_nonmp_frame(ppp, skb);
 
         return;
@@ -2002,7 +2002,7 @@ ppp_register_channel(struct ppp_channel *chan)
         struct channel *pch;
 
         pch = kzalloc(sizeof(struct channel), GFP_KERNEL);
-        if (pch == 0)
+        if (!pch)
                 return -ENOMEM;
         pch->ppp = NULL;
         pch->chan = chan;
@@ -2030,7 +2030,7 @@ int ppp_channel_index(struct ppp_channel *chan)
 {
         struct channel *pch = chan->ppp;
 
-        if (pch != 0)
+        if (pch)
                 return pch->file.index;
         return -1;
 }
@@ -2043,9 +2043,9 @@ int ppp_unit_number(struct ppp_channel *chan)
         struct channel *pch = chan->ppp;
         int unit = -1;
 
-        if (pch != 0) {
+        if (pch) {
                 read_lock_bh(&pch->upl);
-                if (pch->ppp != 0)
+                if (pch->ppp)
                         unit = pch->ppp->file.index;
                 read_unlock_bh(&pch->upl);
         }
@@ -2061,7 +2061,7 @@ ppp_unregister_channel(struct ppp_channel *chan)
 {
         struct channel *pch = chan->ppp;
 
-        if (pch == 0)
+        if (!pch)
                 return;         /* should never happen */
         chan->ppp = NULL;
 
@@ -2093,7 +2093,7 @@ ppp_output_wakeup(struct ppp_channel *chan)
 {
         struct channel *pch = chan->ppp;
 
-        if (pch == 0)
+        if (!pch)
                 return;
         ppp_channel_push(pch);
 }
@@ -2124,18 +2124,18 @@ ppp_set_compress(struct ppp *ppp, unsigned long arg)
 
         cp = find_compressor(ccp_option[0]);
 #ifdef CONFIG_KMOD
-        if (cp == 0) {
+        if (!cp) {
                 request_module("ppp-compress-%d", ccp_option[0]);
                 cp = find_compressor(ccp_option[0]);
         }
 #endif /* CONFIG_KMOD */
-        if (cp == 0)
+        if (!cp)
                 goto out;
 
         err = -ENOBUFS;
         if (data.transmit) {
                 state = cp->comp_alloc(ccp_option, data.length);
-                if (state != 0) {
+                if (state) {
                         ppp_xmit_lock(ppp);
                         ppp->xstate &= ~SC_COMP_RUN;
                         ocomp = ppp->xcomp;
@@ -2143,7 +2143,7 @@ ppp_set_compress(struct ppp *ppp, unsigned long arg)
                         ppp->xcomp = cp;
                         ppp->xc_state = state;
                         ppp_xmit_unlock(ppp);
-                        if (ostate != 0) {
+                        if (ostate) {
                                 ocomp->comp_free(ostate);
                                 module_put(ocomp->owner);
                         }
@@ -2153,7 +2153,7 @@ ppp_set_compress(struct ppp *ppp, unsigned long arg)
 
         } else {
                 state = cp->decomp_alloc(ccp_option, data.length);
-                if (state != 0) {
+                if (state) {
                         ppp_recv_lock(ppp);
                         ppp->rstate &= ~SC_DECOMP_RUN;
                         ocomp = ppp->rcomp;
@@ -2161,7 +2161,7 @@ ppp_set_compress(struct ppp *ppp, unsigned long arg)
                         ppp->rcomp = cp;
                         ppp->rc_state = state;
                         ppp_recv_unlock(ppp);
-                        if (ostate != 0) {
+                        if (ostate) {
                                 ocomp->decomp_free(ostate);
                                 module_put(ocomp->owner);
                         }
@@ -2228,7 +2228,7 @@ ppp_ccp_peek(struct ppp *ppp, struct sk_buff *skb, int inbound)
                         break;
                 if (inbound) {
                         /* we will start receiving compressed packets */
-                        if (ppp->rc_state == 0)
+                        if (!ppp->rc_state)
                                 break;
                         if (ppp->rcomp->decomp_init(ppp->rc_state, dp, len,
                                         ppp->file.index, 0, ppp->mru, ppp->debug)) {
@@ -2237,7 +2237,7 @@ ppp_ccp_peek(struct ppp *ppp, struct sk_buff *skb, int inbound)
                         }
                 } else {
                         /* we will soon start sending compressed packets */
-                        if (ppp->xc_state == 0)
+                        if (!ppp->xc_state)
                                 break;
                         if (ppp->xcomp->comp_init(ppp->xc_state, dp, len,
                                         ppp->file.index, 0, ppp->debug))
@@ -2320,11 +2320,11 @@ ppp_register_compressor(struct compressor *cp)
         int ret;
         spin_lock(&compressor_list_lock);
         ret = -EEXIST;
-        if (find_comp_entry(cp->compress_proto) != 0)
+        if (find_comp_entry(cp->compress_proto))
                 goto out;
         ret = -ENOMEM;
         ce = kmalloc(sizeof(struct compressor_entry), GFP_ATOMIC);
-        if (ce == 0)
+        if (!ce)
                 goto out;
         ret = 0;
         ce->comp = cp;
@@ -2342,7 +2342,7 @@ ppp_unregister_compressor(struct compressor *cp)
 
         spin_lock(&compressor_list_lock);
         ce = find_comp_entry(cp->compress_proto);
-        if (ce != 0 && ce->comp == cp) {
+        if (ce && ce->comp == cp) {
                 list_del(&ce->list);
                 kfree(ce);
         }
@@ -2358,7 +2358,7 @@ find_compressor(int type)
 
         spin_lock(&compressor_list_lock);
         ce = find_comp_entry(type);
-        if (ce != 0) {
+        if (ce) {
                 cp = ce->comp;
                 if (!try_module_get(cp->owner))
                         cp = NULL;
@@ -2383,7 +2383,7 @@ ppp_get_stats(struct ppp *ppp, struct ppp_stats *st)
         st->p.ppp_opackets = ppp->stats.tx_packets;
         st->p.ppp_oerrors = ppp->stats.tx_errors;
         st->p.ppp_obytes = ppp->stats.tx_bytes;
-        if (vj == 0)
+        if (!vj)
                 return;
         st->vj.vjs_packets = vj->sls_o_compressed + vj->sls_o_uncompressed;
         st->vj.vjs_compressed = vj->sls_o_compressed;
@@ -2604,11 +2604,11 @@ ppp_connect_channel(struct channel *pch, int unit)
 
         mutex_lock(&all_ppp_mutex);
         ppp = ppp_find_unit(unit);
-        if (ppp == 0)
+        if (!ppp)
                 goto out;
         write_lock_bh(&pch->upl);
         ret = -EINVAL;
-        if (pch->ppp != 0)
+        if (pch->ppp)
                 goto outl;
 
         ppp_lock(ppp);
@@ -2644,7 +2644,7 @@ ppp_disconnect_channel(struct channel *pch)
         ppp = pch->ppp;
         pch->ppp = NULL;
         write_unlock_bh(&pch->upl);
-        if (ppp != 0) {
+        if (ppp) {
                 /* remove it from the ppp unit's list */
                 ppp_lock(ppp);
                 list_del(&pch->clist);