diff options
| author | Tilman Schmidt <tilman@imap.cc> | 2012-04-25 09:02:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-07 22:37:57 -0400 |
| commit | 7fdaadcc2ee4d43eb43c564dbef85b768565cd7a (patch) | |
| tree | f2e9c9bfa977b820b510cc2e73860cd0211c1e40 | |
| parent | 81fa7b82570ec4337d328e6aee45689455508821 (diff) | |
isdn/capi: fix readability damage
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>
| -rw-r--r-- | drivers/isdn/capi/capi.c | 23 | ||||
| -rw-r--r-- | drivers/isdn/capi/capidrv.c | 8 |
2 files changed, 12 insertions, 19 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index b902794bbf07..9ee399145fb3 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c | |||
| @@ -786,7 +786,6 @@ register_out: | |||
| 786 | return retval; | 786 | return retval; |
| 787 | 787 | ||
| 788 | case CAPI_GET_VERSION: | 788 | case CAPI_GET_VERSION: |
| 789 | { | ||
| 790 | if (copy_from_user(&data.contr, argp, | 789 | if (copy_from_user(&data.contr, argp, |
| 791 | sizeof(data.contr))) | 790 | sizeof(data.contr))) |
| 792 | return -EFAULT; | 791 | return -EFAULT; |
| @@ -796,11 +795,9 @@ register_out: | |||
| 796 | if (copy_to_user(argp, &data.version, | 795 | if (copy_to_user(argp, &data.version, |
| 797 | sizeof(data.version))) | 796 | sizeof(data.version))) |
| 798 | return -EFAULT; | 797 | return -EFAULT; |
| 799 | } | 798 | return 0; |
| 800 | return 0; | ||
| 801 | 799 | ||
| 802 | case CAPI_GET_SERIAL: | 800 | case CAPI_GET_SERIAL: |
| 803 | { | ||
| 804 | if (copy_from_user(&data.contr, argp, | 801 | if (copy_from_user(&data.contr, argp, |
| 805 | sizeof(data.contr))) | 802 | sizeof(data.contr))) |
| 806 | return -EFAULT; | 803 | return -EFAULT; |
| @@ -810,10 +807,9 @@ register_out: | |||
| 810 | if (copy_to_user(argp, data.serial, | 807 | if (copy_to_user(argp, data.serial, |
| 811 | sizeof(data.serial))) | 808 | sizeof(data.serial))) |
| 812 | return -EFAULT; | 809 | return -EFAULT; |
| 813 | } | 810 | return 0; |
| 814 | return 0; | 811 | |
| 815 | case CAPI_GET_PROFILE: | 812 | case CAPI_GET_PROFILE: |
| 816 | { | ||
| 817 | if (copy_from_user(&data.contr, argp, | 813 | if (copy_from_user(&data.contr, argp, |
| 818 | sizeof(data.contr))) | 814 | sizeof(data.contr))) |
| 819 | return -EFAULT; | 815 | return -EFAULT; |
| @@ -837,11 +833,9 @@ register_out: | |||
| 837 | } | 833 | } |
| 838 | if (retval) | 834 | if (retval) |
| 839 | return -EFAULT; | 835 | return -EFAULT; |
| 840 | } | 836 | return 0; |
| 841 | return 0; | ||
| 842 | 837 | ||
| 843 | case CAPI_GET_MANUFACTURER: | 838 | case CAPI_GET_MANUFACTURER: |
| 844 | { | ||
| 845 | if (copy_from_user(&data.contr, argp, | 839 | if (copy_from_user(&data.contr, argp, |
| 846 | sizeof(data.contr))) | 840 | sizeof(data.contr))) |
| 847 | return -EFAULT; | 841 | return -EFAULT; |
| @@ -853,8 +847,8 @@ register_out: | |||
| 853 | sizeof(data.manufacturer))) | 847 | sizeof(data.manufacturer))) |
| 854 | return -EFAULT; | 848 | return -EFAULT; |
| 855 | 849 | ||
| 856 | } | 850 | return 0; |
| 857 | return 0; | 851 | |
| 858 | case CAPI_GET_ERRCODE: | 852 | case CAPI_GET_ERRCODE: |
| 859 | data.errcode = cdev->errcode; | 853 | data.errcode = cdev->errcode; |
| 860 | cdev->errcode = CAPI_NOERROR; | 854 | cdev->errcode = CAPI_NOERROR; |
| @@ -870,8 +864,7 @@ register_out: | |||
| 870 | return 0; | 864 | return 0; |
| 871 | return -ENXIO; | 865 | return -ENXIO; |
| 872 | 866 | ||
| 873 | case CAPI_MANUFACTURER_CMD: | 867 | case CAPI_MANUFACTURER_CMD: { |
| 874 | { | ||
| 875 | struct capi_manufacturer_cmd mcmd; | 868 | struct capi_manufacturer_cmd mcmd; |
| 876 | if (!capable(CAP_SYS_ADMIN)) | 869 | if (!capable(CAP_SYS_ADMIN)) |
| 877 | return -EPERM; | 870 | return -EPERM; |
| @@ -879,8 +872,6 @@ register_out: | |||
| 879 | return -EFAULT; | 872 | return -EFAULT; |
| 880 | return capi20_manufacturer(mcmd.cmd, mcmd.data); | 873 | return capi20_manufacturer(mcmd.cmd, mcmd.data); |
| 881 | } | 874 | } |
| 882 | return 0; | ||
| 883 | |||
| 884 | case CAPI_SET_FLAGS: | 875 | case CAPI_SET_FLAGS: |
| 885 | case CAPI_CLR_FLAGS: { | 876 | case CAPI_CLR_FLAGS: { |
| 886 | unsigned userflags; | 877 | unsigned userflags; |
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index 6f5016b479f8..832bc807ed20 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c | |||
| @@ -1593,7 +1593,7 @@ static int capidrv_command(isdn_ctrl *c, capidrv_contr *card) | |||
| 1593 | return capidrv_ioctl(c, card); | 1593 | return capidrv_ioctl(c, card); |
| 1594 | 1594 | ||
| 1595 | switch (c->command) { | 1595 | switch (c->command) { |
| 1596 | case ISDN_CMD_DIAL:{ | 1596 | case ISDN_CMD_DIAL: { |
| 1597 | u8 calling[ISDN_MSNLEN + 3]; | 1597 | u8 calling[ISDN_MSNLEN + 3]; |
| 1598 | u8 called[ISDN_MSNLEN + 2]; | 1598 | u8 called[ISDN_MSNLEN + 2]; |
| 1599 | 1599 | ||
| @@ -2072,7 +2072,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp) | |||
| 2072 | card->interface.writebuf_skb = if_sendbuf; | 2072 | card->interface.writebuf_skb = if_sendbuf; |
| 2073 | card->interface.writecmd = NULL; | 2073 | card->interface.writecmd = NULL; |
| 2074 | card->interface.readstat = if_readstat; | 2074 | card->interface.readstat = if_readstat; |
| 2075 | card->interface.features = ISDN_FEATURE_L2_HDLC | | 2075 | card->interface.features = |
| 2076 | ISDN_FEATURE_L2_HDLC | | ||
| 2076 | ISDN_FEATURE_L2_TRANS | | 2077 | ISDN_FEATURE_L2_TRANS | |
| 2077 | ISDN_FEATURE_L3_TRANS | | 2078 | ISDN_FEATURE_L3_TRANS | |
| 2078 | ISDN_FEATURE_P_UNKNOWN | | 2079 | ISDN_FEATURE_P_UNKNOWN | |
| @@ -2080,7 +2081,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp) | |||
| 2080 | ISDN_FEATURE_L2_X75UI | | 2081 | ISDN_FEATURE_L2_X75UI | |
| 2081 | ISDN_FEATURE_L2_X75BUI; | 2082 | ISDN_FEATURE_L2_X75BUI; |
| 2082 | if (profp->support1 & (1 << 2)) | 2083 | if (profp->support1 & (1 << 2)) |
| 2083 | card->interface.features |= ISDN_FEATURE_L2_V11096 | | 2084 | card->interface.features |= |
| 2085 | ISDN_FEATURE_L2_V11096 | | ||
| 2084 | ISDN_FEATURE_L2_V11019 | | 2086 | ISDN_FEATURE_L2_V11019 | |
| 2085 | ISDN_FEATURE_L2_V11038; | 2087 | ISDN_FEATURE_L2_V11038; |
| 2086 | if (profp->support1 & (1 << 8)) | 2088 | if (profp->support1 & (1 << 8)) |
