isdn/capi: fix readability damage
authorTilman Schmidt <tilman@imap.cc>
Wed, 25 Apr 2012 13:02:20 +0000 (13:02 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 May 2012 02:37:57 +0000 (22:37 -0400)
Fix up some of the readibility deterioration caused by the recent
whitespace coding style cleanup.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/isdn/capi/capi.c
drivers/isdn/capi/capidrv.c

index b902794bbf07b6c349924b866fe9aa6bfab40794..9ee399145fb33bdf0323c79a3349562a06a2db1a 100644 (file)
@@ -786,7 +786,6 @@ register_out:
                return retval;
 
        case CAPI_GET_VERSION:
-       {
                if (copy_from_user(&data.contr, argp,
                                   sizeof(data.contr)))
                        return -EFAULT;
@@ -796,11 +795,9 @@ register_out:
                if (copy_to_user(argp, &data.version,
                                 sizeof(data.version)))
                        return -EFAULT;
-       }
-       return 0;
+               return 0;
 
        case CAPI_GET_SERIAL:
-       {
                if (copy_from_user(&data.contr, argp,
                                   sizeof(data.contr)))
                        return -EFAULT;
@@ -810,10 +807,9 @@ register_out:
                if (copy_to_user(argp, data.serial,
                                 sizeof(data.serial)))
                        return -EFAULT;
-       }
-       return 0;
+               return 0;
+
        case CAPI_GET_PROFILE:
-       {
                if (copy_from_user(&data.contr, argp,
                                   sizeof(data.contr)))
                        return -EFAULT;
@@ -837,11 +833,9 @@ register_out:
                }
                if (retval)
                        return -EFAULT;
-       }
-       return 0;
+               return 0;
 
        case CAPI_GET_MANUFACTURER:
-       {
                if (copy_from_user(&data.contr, argp,
                                   sizeof(data.contr)))
                        return -EFAULT;
@@ -853,8 +847,8 @@ register_out:
                                 sizeof(data.manufacturer)))
                        return -EFAULT;
 
-       }
-       return 0;
+               return 0;
+
        case CAPI_GET_ERRCODE:
                data.errcode = cdev->errcode;
                cdev->errcode = CAPI_NOERROR;
@@ -870,8 +864,7 @@ register_out:
                        return 0;
                return -ENXIO;
 
-       case CAPI_MANUFACTURER_CMD:
-       {
+       case CAPI_MANUFACTURER_CMD: {
                struct capi_manufacturer_cmd mcmd;
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
@@ -879,8 +872,6 @@ register_out:
                        return -EFAULT;
                return capi20_manufacturer(mcmd.cmd, mcmd.data);
        }
-       return 0;
-
        case CAPI_SET_FLAGS:
        case CAPI_CLR_FLAGS: {
                unsigned userflags;
index 6f5016b479f8a9188fd53a1624fe6cb5375db52e..832bc807ed20ec38a565578b209ec363190ad31f 100644 (file)
@@ -1593,7 +1593,7 @@ static int capidrv_command(isdn_ctrl *c, capidrv_contr *card)
                return capidrv_ioctl(c, card);
 
        switch (c->command) {
-       case ISDN_CMD_DIAL:{
+       case ISDN_CMD_DIAL: {
                u8 calling[ISDN_MSNLEN + 3];
                u8 called[ISDN_MSNLEN + 2];
 
@@ -2072,7 +2072,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
        card->interface.writebuf_skb = if_sendbuf;
        card->interface.writecmd = NULL;
        card->interface.readstat = if_readstat;
-       card->interface.features = ISDN_FEATURE_L2_HDLC |
+       card->interface.features =
+               ISDN_FEATURE_L2_HDLC |
                ISDN_FEATURE_L2_TRANS |
                ISDN_FEATURE_L3_TRANS |
                ISDN_FEATURE_P_UNKNOWN |
@@ -2080,7 +2081,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
                ISDN_FEATURE_L2_X75UI |
                ISDN_FEATURE_L2_X75BUI;
        if (profp->support1 & (1 << 2))
-               card->interface.features |= ISDN_FEATURE_L2_V11096 |
+               card->interface.features |=
+                       ISDN_FEATURE_L2_V11096 |
                        ISDN_FEATURE_L2_V11019 |
                        ISDN_FEATURE_L2_V11038;
        if (profp->support1 & (1 << 8))