aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBas Peters <baspeters93@gmail.com>2015-02-04 17:33:01 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-05 18:40:23 -0500
commit3581ec58a82b90ae8768aea2ab9e528a79c2406f (patch)
tree13440d8806eb5c8a50e08017d04f52c30a6b3392
parentcacccb068ce934fb88afc6bc34fd84f7e85f19d4 (diff)
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>
-rw-r--r--drivers/isdn/isdnloop/isdnloop.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index e4d36203f3d1..ef9c8e4f1fa2 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -552,9 +552,9 @@ isdnloop_unicause(isdnloop_card *card, int loc, int cau)
552 sprintf(buf, "%02X44", ctable_1t[cau]); 552 sprintf(buf, "%02X44", ctable_1t[cau]);
553 break; 553 break;
554 default: 554 default:
555 return ("0000"); 555 return "0000";
556 } 556 }
557 return (buf); 557 return buf;
558} 558}
559 559
560/* 560/*
@@ -750,17 +750,17 @@ isdnloop_vstphone(isdnloop_card *card, char *phone, int caller)
750 if (caller) { 750 if (caller) {
751 for (i = 0; i < 2; i++) 751 for (i = 0; i < 2; i++)
752 if (!(strcmp(card->s0num[i], phone))) 752 if (!(strcmp(card->s0num[i], phone)))
753 return (phone); 753 return phone;
754 return (card->s0num[0]); 754 return card->s0num[0];
755 } 755 }
756 return (phone); 756 return phone;
757 break; 757 break;
758 case ISDN_PTYPE_1TR6: 758 case ISDN_PTYPE_1TR6:
759 if (caller) { 759 if (caller) {
760 sprintf(nphone, "%s%c", card->s0num[0], phone[0]); 760 sprintf(nphone, "%s%c", card->s0num[0], phone[0]);
761 return (nphone); 761 return nphone;
762 } else 762 } else
763 return (&phone[strlen(phone) - 1]); 763 return &phone[strlen(phone) - 1];
764 break; 764 break;
765 } 765 }
766 return ""; 766 return "";
@@ -1144,14 +1144,14 @@ isdnloop_command(isdn_ctrl *c, isdnloop_card *card)
1144 case ISDNLOOP_IOCTL_STARTUP: 1144 case ISDNLOOP_IOCTL_STARTUP:
1145 if (!access_ok(VERIFY_READ, (void *) a, sizeof(isdnloop_sdef))) 1145 if (!access_ok(VERIFY_READ, (void *) a, sizeof(isdnloop_sdef)))
1146 return -EFAULT; 1146 return -EFAULT;
1147 return (isdnloop_start(card, (isdnloop_sdef *) a)); 1147 return isdnloop_start(card, (isdnloop_sdef *) a);
1148 break; 1148 break;
1149 case ISDNLOOP_IOCTL_ADDCARD: 1149 case ISDNLOOP_IOCTL_ADDCARD:
1150 if (copy_from_user((char *)&cdef, 1150 if (copy_from_user((char *)&cdef,
1151 (char *)a, 1151 (char *)a,
1152 sizeof(cdef))) 1152 sizeof(cdef)))
1153 return -EFAULT; 1153 return -EFAULT;
1154 return (isdnloop_addcard(cdef.id1)); 1154 return isdnloop_addcard(cdef.id1);
1155 break; 1155 break;
1156 case ISDNLOOP_IOCTL_LEASEDCFG: 1156 case ISDNLOOP_IOCTL_LEASEDCFG:
1157 if (a) { 1157 if (a) {
@@ -1373,7 +1373,7 @@ if_command(isdn_ctrl *c)
1373 isdnloop_card *card = isdnloop_findcard(c->driver); 1373 isdnloop_card *card = isdnloop_findcard(c->driver);
1374 1374
1375 if (card) 1375 if (card)
1376 return (isdnloop_command(c, card)); 1376 return isdnloop_command(c, card);
1377 printk(KERN_ERR 1377 printk(KERN_ERR
1378 "isdnloop: if_command called with invalid driverId!\n"); 1378 "isdnloop: if_command called with invalid driverId!\n");
1379 return -ENODEV; 1379 return -ENODEV;
@@ -1387,7 +1387,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
1387 if (card) { 1387 if (card) {
1388 if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1388 if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
1389 return -ENODEV; 1389 return -ENODEV;
1390 return (isdnloop_writecmd(buf, len, 1, card)); 1390 return isdnloop_writecmd(buf, len, 1, card);
1391 } 1391 }
1392 printk(KERN_ERR 1392 printk(KERN_ERR
1393 "isdnloop: if_writecmd called with invalid driverId!\n"); 1393 "isdnloop: if_writecmd called with invalid driverId!\n");
@@ -1402,7 +1402,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel)
1402 if (card) { 1402 if (card) {
1403 if (!(card->flags & ISDNLOOP_FLAGS_RUNNING)) 1403 if (!(card->flags & ISDNLOOP_FLAGS_RUNNING))
1404 return -ENODEV; 1404 return -ENODEV;
1405 return (isdnloop_readstatus(buf, len, card)); 1405 return isdnloop_readstatus(buf, len, card);
1406 } 1406 }
1407 printk(KERN_ERR 1407 printk(KERN_ERR
1408 "isdnloop: if_readstatus called with invalid driverId!\n"); 1408 "isdnloop: if_readstatus called with invalid driverId!\n");
@@ -1419,7 +1419,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
1419 return -ENODEV; 1419 return -ENODEV;
1420 /* ack request stored in skb scratch area */ 1420 /* ack request stored in skb scratch area */
1421 *(skb->head) = ack; 1421 *(skb->head) = ack;
1422 return (isdnloop_sendbuf(channel, skb, card)); 1422 return isdnloop_sendbuf(channel, skb, card);
1423 } 1423 }
1424 printk(KERN_ERR 1424 printk(KERN_ERR
1425 "isdnloop: if_sendbuf called with invalid driverId!\n"); 1425 "isdnloop: if_sendbuf called with invalid driverId!\n");
@@ -1499,7 +1499,7 @@ static int __init
1499isdnloop_init(void) 1499isdnloop_init(void)
1500{ 1500{
1501 if (isdnloop_id) 1501 if (isdnloop_id)
1502 return (isdnloop_addcard(isdnloop_id)); 1502 return isdnloop_addcard(isdnloop_id);
1503 1503
1504 return 0; 1504 return 0;
1505} 1505}