openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drivers: isdn: isdnloop: isdnloop.c: Remove parenthesis around return values, as specified in CodingStyle. 

Signed-off-by: Bas Peters <baspeters93@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Bas Peters 2015-02-04 23:33:01 +01:00 committed by David S. Miller
parent cacccb068c
commit 3581ec58a8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/isdn/isdnloop/isdnloop.c
View File

@ -552,9 +552,9 @@ isdnloop_unicause(isdnloop_card *card, int loc, int cau)
sprintf(buf, "%02X44", ctable_1t[cau]); sprintf(buf, "%02X44", ctable_1t[cau]);
break; break;
default: default:
return ("0000"); return "0000";
} }
return (buf); return buf;
} }
/* /*
@ -750,17 +750,17 @@ isdnloop_vstphone(isdnloop_card *card, char *phone, int caller)
if (caller) { if (caller) {
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
if (!(strcmp(card->s0num[i], phone))) if (!(strcmp(card->s0num[i], phone)))
return (phone); return phone;
return (card->s0num[0]); return card->s0num[0];
} }
return (phone); return phone;
break; break;
case ISDN_PTYPE_1TR6: case ISDN_PTYPE_1TR6:
if (caller) { if (caller) {
sprintf(nphone, "%s%c", card->s0num[0], phone[0]); sprintf(nphone, "%s%c", card->s0num[0], phone[0]);
return (nphone); return nphone;
} else } else
return (&phone[strlen(phone) - 1]); return &phone[strlen(phone) - 1];
break; break;
} }
return ""; return "";
@ -1144,14 +1144,14 @@ isdnloop_command(isdn_ctrl *c, isdnloop_card *card)
case ISDNLOOP_IOCTL_STARTUP: case ISDNLOOP_IOCTL_STARTUP:
if (!access_ok(VERIFY_READ, (void *) a, sizeof(isdnloop_sdef))) if (!access_ok(VERIFY_READ, (void *) a, sizeof(isdnloop_sdef)))
return -EFAULT; return -EFAULT;
return (isdnloop_start(card, (isdnloop_sdef *) a)); return isdnloop_start(card, (isdnloop_sdef *) a);
break; break;
case ISDNLOOP_IOCTL_ADDCARD: case ISDNLOOP_IOCTL_ADDCARD:
if (copy_from_user((char *)&cdef, if (copy_from_user((char *)&cdef,
(char *)a, (char *)a,
sizeof(cdef))) sizeof(cdef)))
return -EFAULT; return -EFAULT;
return (isdnloop_addcard(cdef.id1)); return isdnloop_addcard(cdef.id1);
break; break;
case ISDNLOOP_IOCTL_LEASEDCFG: case ISDNLOOP_IOCTL_LEASEDCFG:
if (a) { if (a) {
@ -1373,7 +1373,7 @@ if_command(isdn_ctrl *c)
isdnloop_card *card = isdnloop_findcard(c->driver); isdnloop_card *card = isdnloop_findcard(c->driver);
if (card) if (card)
return (isdnloop_command(c, card)); return isdnloop_command(c, card);
printk(KERN_ERR printk(KERN_ERR
"isdnloop: if_command called with invalid driverId!\n"); "isdnloop: if_command called with invalid driverId!\n");
return -ENODEV; return -ENODEV;
@ -1387,7 +1387,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
if (card) { if (card) {
if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (isdnloop_writecmd(buf, len, 1, card)); return isdnloop_writecmd(buf, len, 1, card);
} }
printk(KERN_ERR printk(KERN_ERR
"isdnloop: if_writecmd called with invalid driverId!\n"); "isdnloop: if_writecmd called with invalid driverId!\n");
@ -1402,7 +1402,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel)
if (card) { if (card) {
if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
return -ENODEV; return -ENODEV;
return (isdnloop_readstatus(buf, len, card)); return isdnloop_readstatus(buf, len, card);
} }
printk(KERN_ERR printk(KERN_ERR
"isdnloop: if_readstatus called with invalid driverId!\n"); "isdnloop: if_readstatus called with invalid driverId!\n");
@ -1419,7 +1419,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
return -ENODEV; return -ENODEV;
/* ack request stored in skb scratch area */ /* ack request stored in skb scratch area */
*(skb->head) = ack; *(skb->head) = ack;
return (isdnloop_sendbuf(channel, skb, card)); return isdnloop_sendbuf(channel, skb, card);
} }
printk(KERN_ERR printk(KERN_ERR
"isdnloop: if_sendbuf called with invalid driverId!\n"); "isdnloop: if_sendbuf called with invalid driverId!\n");
@ -1499,7 +1499,7 @@ static int __init
isdnloop_init(void) isdnloop_init(void)
{ {
if (isdnloop_id) if (isdnloop_id)
return (isdnloop_addcard(isdnloop_id)); return isdnloop_addcard(isdnloop_id);
return 0; return 0;
} }