Commit 7fdaadcc authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller

isdn/capi: fix readability damage

Fix up some of the readibility deterioration caused by the recent
whitespace coding style cleanup.
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81fa7b82
...@@ -786,7 +786,6 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -786,7 +786,6 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return retval; return retval;
case CAPI_GET_VERSION: case CAPI_GET_VERSION:
{
if (copy_from_user(&data.contr, argp, if (copy_from_user(&data.contr, argp,
sizeof(data.contr))) sizeof(data.contr)))
return -EFAULT; return -EFAULT;
...@@ -796,11 +795,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -796,11 +795,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (copy_to_user(argp, &data.version, if (copy_to_user(argp, &data.version,
sizeof(data.version))) sizeof(data.version)))
return -EFAULT; return -EFAULT;
}
return 0; return 0;
case CAPI_GET_SERIAL: case CAPI_GET_SERIAL:
{
if (copy_from_user(&data.contr, argp, if (copy_from_user(&data.contr, argp,
sizeof(data.contr))) sizeof(data.contr)))
return -EFAULT; return -EFAULT;
...@@ -810,10 +807,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -810,10 +807,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (copy_to_user(argp, data.serial, if (copy_to_user(argp, data.serial,
sizeof(data.serial))) sizeof(data.serial)))
return -EFAULT; return -EFAULT;
}
return 0; return 0;
case CAPI_GET_PROFILE: case CAPI_GET_PROFILE:
{
if (copy_from_user(&data.contr, argp, if (copy_from_user(&data.contr, argp,
sizeof(data.contr))) sizeof(data.contr)))
return -EFAULT; return -EFAULT;
...@@ -837,11 +833,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -837,11 +833,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
} }
if (retval) if (retval)
return -EFAULT; return -EFAULT;
}
return 0; return 0;
case CAPI_GET_MANUFACTURER: case CAPI_GET_MANUFACTURER:
{
if (copy_from_user(&data.contr, argp, if (copy_from_user(&data.contr, argp,
sizeof(data.contr))) sizeof(data.contr)))
return -EFAULT; return -EFAULT;
...@@ -853,8 +847,8 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -853,8 +847,8 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
sizeof(data.manufacturer))) sizeof(data.manufacturer)))
return -EFAULT; return -EFAULT;
}
return 0; return 0;
case CAPI_GET_ERRCODE: case CAPI_GET_ERRCODE:
data.errcode = cdev->errcode; data.errcode = cdev->errcode;
cdev->errcode = CAPI_NOERROR; cdev->errcode = CAPI_NOERROR;
...@@ -870,8 +864,7 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -870,8 +864,7 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return 0; return 0;
return -ENXIO; return -ENXIO;
case CAPI_MANUFACTURER_CMD: case CAPI_MANUFACTURER_CMD: {
{
struct capi_manufacturer_cmd mcmd; struct capi_manufacturer_cmd mcmd;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
...@@ -879,8 +872,6 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -879,8 +872,6 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return -EFAULT; return -EFAULT;
return capi20_manufacturer(mcmd.cmd, mcmd.data); return capi20_manufacturer(mcmd.cmd, mcmd.data);
} }
return 0;
case CAPI_SET_FLAGS: case CAPI_SET_FLAGS:
case CAPI_CLR_FLAGS: { case CAPI_CLR_FLAGS: {
unsigned userflags; unsigned userflags;
......
...@@ -1593,7 +1593,7 @@ static int capidrv_command(isdn_ctrl *c, capidrv_contr *card) ...@@ -1593,7 +1593,7 @@ static int capidrv_command(isdn_ctrl *c, capidrv_contr *card)
return capidrv_ioctl(c, card); return capidrv_ioctl(c, card);
switch (c->command) { switch (c->command) {
case ISDN_CMD_DIAL:{ case ISDN_CMD_DIAL: {
u8 calling[ISDN_MSNLEN + 3]; u8 calling[ISDN_MSNLEN + 3];
u8 called[ISDN_MSNLEN + 2]; u8 called[ISDN_MSNLEN + 2];
...@@ -2072,7 +2072,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp) ...@@ -2072,7 +2072,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
card->interface.writebuf_skb = if_sendbuf; card->interface.writebuf_skb = if_sendbuf;
card->interface.writecmd = NULL; card->interface.writecmd = NULL;
card->interface.readstat = if_readstat; 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_L2_TRANS |
ISDN_FEATURE_L3_TRANS | ISDN_FEATURE_L3_TRANS |
ISDN_FEATURE_P_UNKNOWN | ISDN_FEATURE_P_UNKNOWN |
...@@ -2080,7 +2081,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp) ...@@ -2080,7 +2081,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
ISDN_FEATURE_L2_X75UI | ISDN_FEATURE_L2_X75UI |
ISDN_FEATURE_L2_X75BUI; ISDN_FEATURE_L2_X75BUI;
if (profp->support1 & (1 << 2)) 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_V11019 |
ISDN_FEATURE_L2_V11038; ISDN_FEATURE_L2_V11038;
if (profp->support1 & (1 << 8)) if (profp->support1 & (1 << 8))
......
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