Commit 50a58b6b authored by Bas Peters's avatar Bas Peters Committed by David S. Miller

drivers: isdn: isdnloop: isdnloop.c: remove assignment of variables in if...

drivers: isdn: isdnloop: isdnloop.c: remove assignment of variables in if conditions, in accordance with the CodingStyle.
Signed-off-by: default avatarBas Peters <baspeters93@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e03f896
...@@ -59,7 +59,8 @@ isdnloop_bchan_send(isdnloop_card *card, int ch) ...@@ -59,7 +59,8 @@ isdnloop_bchan_send(isdnloop_card *card, int ch)
isdn_ctrl cmd; isdn_ctrl cmd;
while (card->sndcount[ch]) { while (card->sndcount[ch]) {
if ((skb = skb_dequeue(&card->bqueue[ch]))) { skb = skb_dequeue(&card->bqueue[ch]);
if (skb) {
len = skb->len; len = skb->len;
card->sndcount[ch] -= len; card->sndcount[ch] -= len;
ack = *(skb->head); /* used as scratch area */ ack = *(skb->head); /* used as scratch area */
...@@ -317,7 +318,8 @@ isdnloop_polldchan(unsigned long data) ...@@ -317,7 +318,8 @@ isdnloop_polldchan(unsigned long data)
u_char *p; u_char *p;
isdn_ctrl cmd; isdn_ctrl cmd;
if ((skb = skb_dequeue(&card->dqueue))) skb = skb_dequeue(&card->dqueue);
if (skb)
avail = skb->len; avail = skb->len;
else else
avail = 0; avail = 0;
...@@ -471,8 +473,8 @@ isdnloop_fake(isdnloop_card *card, char *s, int ch) ...@@ -471,8 +473,8 @@ isdnloop_fake(isdnloop_card *card, char *s, int ch)
{ {
struct sk_buff *skb; struct sk_buff *skb;
int len = strlen(s) + ((ch >= 0) ? 3 : 0); int len = strlen(s) + ((ch >= 0) ? 3 : 0);
skb = dev_alloc_skb(len);
if (!(skb = dev_alloc_skb(len))) { if (!skb) {
printk(KERN_WARNING "isdnloop: Out of memory in isdnloop_fake\n"); printk(KERN_WARNING "isdnloop: Out of memory in isdnloop_fake\n");
return 1; return 1;
} }
...@@ -1439,8 +1441,8 @@ isdnloop_initcard(char *id) ...@@ -1439,8 +1441,8 @@ isdnloop_initcard(char *id)
{ {
isdnloop_card *card; isdnloop_card *card;
int i; int i;
card = kzalloc(sizeof(isdnloop_card), GFP_KERNEL);
if (!(card = kzalloc(sizeof(isdnloop_card), GFP_KERNEL))) { if (!card) {
printk(KERN_WARNING printk(KERN_WARNING
"isdnloop: (%s) Could not allocate card-struct.\n", id); "isdnloop: (%s) Could not allocate card-struct.\n", id);
return (isdnloop_card *) 0; return (isdnloop_card *) 0;
...@@ -1489,8 +1491,8 @@ static int ...@@ -1489,8 +1491,8 @@ static int
isdnloop_addcard(char *id1) isdnloop_addcard(char *id1)
{ {
isdnloop_card *card; isdnloop_card *card;
card = isdnloop_initcard(id1);
if (!(card = isdnloop_initcard(id1))) { if (!card) {
return -EIO; return -EIO;
} }
printk(KERN_INFO printk(KERN_INFO
......
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