Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/isdn/capi/capi.c

+7 −16
Original line number Diff line number Diff line
@@ -786,7 +786,6 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		return retval;



	case CAPI_GET_VERSION:

	{

		if (copy_from_user(&data.contr, argp,

				   sizeof(data.contr)))

			return -EFAULT;
@@ -796,11 +795,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		if (copy_to_user(argp, &data.version,

				 sizeof(data.version)))

			return -EFAULT;

	}

		return 0;



	case CAPI_GET_SERIAL:

	{

		if (copy_from_user(&data.contr, argp,

				   sizeof(data.contr)))

			return -EFAULT;
@@ -810,10 +807,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		if (copy_to_user(argp, data.serial,

				 sizeof(data.serial)))

			return -EFAULT;

	}

		return 0;



	case CAPI_GET_PROFILE:

	{

		if (copy_from_user(&data.contr, argp,

				   sizeof(data.contr)))

			return -EFAULT;
@@ -837,11 +833,9 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		}

		if (retval)

			return -EFAULT;

	}

		return 0;



	case CAPI_GET_MANUFACTURER:

	{

		if (copy_from_user(&data.contr, argp,

				   sizeof(data.contr)))

			return -EFAULT;
@@ -853,8 +847,8 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
				 sizeof(data.manufacturer)))

			return -EFAULT;



	}

		return 0;



	case CAPI_GET_ERRCODE:

		data.errcode = cdev->errcode;

		cdev->errcode = CAPI_NOERROR;
@@ -870,8 +864,7 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			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 @@ capi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			return -EFAULT;

		return capi20_manufacturer(mcmd.cmd, mcmd.data);

	}

	return 0;



	case CAPI_SET_FLAGS:

	case CAPI_CLR_FLAGS: {

		unsigned userflags;

drivers/isdn/capi/capidrv.c

+5 −3
Original line number Diff line number Diff line
@@ -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))