aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-05-05 13:06:00 -0400
committerMichael Grzeschik <m.grzeschik@pengutronix.de>2015-09-23 02:44:25 -0400
commitd8101e7bec352b7b6a154ec2e428d01bddb7e5b4 (patch)
tree31d7cf87d1b3ded4ab5754fa9662fdd9641ea656
parent97464eddf9fdbe02abfc44676949e07708cf557f (diff)
arcnet: Remove pointer comparisons to NULL
Use direct tests of pointer instead. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
-rw-r--r--drivers/net/arcnet/arc-rawmode.c2
-rw-r--r--drivers/net/arcnet/capmode.c4
-rw-r--r--drivers/net/arcnet/rfc1051.c2
-rw-r--r--drivers/net/arcnet/rfc1201.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c
index 7fc5b0420d62..40035ee8cb40 100644
--- a/drivers/net/arcnet/arc-rawmode.c
+++ b/drivers/net/arcnet/arc-rawmode.c
@@ -97,7 +97,7 @@ static void rx(struct net_device *dev, int bufnum,
97 ofs = 256 - length; 97 ofs = 256 - length;
98 98
99 skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC); 99 skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
100 if (skb == NULL) { 100 if (!skb) {
101 dev->stats.rx_dropped++; 101 dev->stats.rx_dropped++;
102 return; 102 return;
103 } 103 }
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index de80d9e0e53f..a898647ab05d 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -56,7 +56,7 @@ static void rx(struct net_device *dev, int bufnum,
56 ofs = 256 - length; 56 ofs = 256 - length;
57 57
58 skb = alloc_skb(length + ARC_HDR_SIZE + sizeof(int), GFP_ATOMIC); 58 skb = alloc_skb(length + ARC_HDR_SIZE + sizeof(int), GFP_ATOMIC);
59 if (skb == NULL) { 59 if (!skb) {
60 dev->stats.rx_dropped++; 60 dev->stats.rx_dropped++;
61 return; 61 return;
62 } 62 }
@@ -196,7 +196,7 @@ static int ack_tx(struct net_device *dev, int acked)
196 196
197 /* Now alloc a skb to send back up through the layers: */ 197 /* Now alloc a skb to send back up through the layers: */
198 ackskb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC); 198 ackskb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
199 if (ackskb == NULL) 199 if (!ackskb)
200 goto free_outskb; 200 goto free_outskb;
201 201
202 skb_put(ackskb, length + ARC_HDR_SIZE); 202 skb_put(ackskb, length + ARC_HDR_SIZE);
diff --git a/drivers/net/arcnet/rfc1051.c b/drivers/net/arcnet/rfc1051.c
index 7e7eda5b0232..b76e458b19e0 100644
--- a/drivers/net/arcnet/rfc1051.c
+++ b/drivers/net/arcnet/rfc1051.c
@@ -133,7 +133,7 @@ static void rx(struct net_device *dev, int bufnum,
133 ofs = 256 - length; 133 ofs = 256 - length;
134 134
135 skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC); 135 skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
136 if (skb == NULL) { 136 if (!skb) {
137 dev->stats.rx_dropped++; 137 dev->stats.rx_dropped++;
138 return; 138 return;
139 } 139 }
diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c
index 9040a8be155c..1d777c1e8383 100644
--- a/drivers/net/arcnet/rfc1201.c
+++ b/drivers/net/arcnet/rfc1201.c
@@ -178,7 +178,7 @@ static void rx(struct net_device *dev, int bufnum,
178 in->sequence = soft->sequence; 178 in->sequence = soft->sequence;
179 179
180 skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC); 180 skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
181 if (skb == NULL) { 181 if (!skb) {
182 dev->stats.rx_dropped++; 182 dev->stats.rx_dropped++;
183 return; 183 return;
184 } 184 }
@@ -286,7 +286,7 @@ static void rx(struct net_device *dev, int bufnum,
286 } 286 }
287 in->skb = skb = alloc_skb(508 * in->numpackets + ARC_HDR_SIZE, 287 in->skb = skb = alloc_skb(508 * in->numpackets + ARC_HDR_SIZE,
288 GFP_ATOMIC); 288 GFP_ATOMIC);
289 if (skb == NULL) { 289 if (!skb) {
290 arc_printk(D_NORMAL, dev, "(split) memory squeeze, dropping packet.\n"); 290 arc_printk(D_NORMAL, dev, "(split) memory squeeze, dropping packet.\n");
291 lp->rfc1201.aborted_seq = soft->sequence; 291 lp->rfc1201.aborted_seq = soft->sequence;
292 dev->stats.rx_dropped++; 292 dev->stats.rx_dropped++;