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

Commit 566f2d9e authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: remove unnecessary braces 



Remove the following checkpatch warnings

WARNING: braces {} are not necessary for any arm of this statement
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a94e8427

drivers/net/wireless/orinoco/orinoco.c

+7 −11
Original line number Original line Diff line number Diff line
@@ -3497,9 +3497,8 @@ static int orinoco_init(struct net_device *dev) 
	/* Get initial AP density */

	/* Get initial AP density */

	err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFSYSTEMSCALE,

	err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFSYSTEMSCALE,

				  &priv->ap_density);

				  &priv->ap_density);

	if (err || priv->ap_density < 1 || priv->ap_density > 3) {

	if (err || priv->ap_density < 1 || priv->ap_density > 3)

		priv->has_sensitivity = 0;

		priv->has_sensitivity = 0;

	}





	/* Get initial RTS threshold */

	/* Get initial RTS threshold */

	err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD,

	err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD,
@@ -3811,9 +3810,8 @@ static int orinoco_hw_get_bitratelist(struct orinoco_private *priv, 
	*numrates = num;

	*numrates = num;

	num = min(num, max);

	num = min(num, max);





	for (i = 0; i < num; i++) {

	for (i = 0; i < num; i++)

		rates[i] = (p[i] & 0x7f) * 500000; /* convert to bps */

		rates[i] = (p[i] & 0x7f) * 500000; /* convert to bps */

	}





	return 0;

	return 0;

}

}
@@ -4130,11 +4128,11 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, 
			index = priv->tx_key;

			index = priv->tx_key;





		/* Adjust key length to a supported value */

		/* Adjust key length to a supported value */

		if (erq->length > SMALL_KEY_SIZE) {

		if (erq->length > SMALL_KEY_SIZE)

			xlen = LARGE_KEY_SIZE;

			xlen = LARGE_KEY_SIZE;

		} else if (erq->length > 0) {

		else if (erq->length > 0)

			xlen = SMALL_KEY_SIZE;

			xlen = SMALL_KEY_SIZE;

		} else

		else

			xlen = 0;

			xlen = 0;





		/* Switch on WEP if off */

		/* Switch on WEP if off */
@@ -4256,9 +4254,8 @@ static int orinoco_ioctl_setessid(struct net_device *dev, 
	memset(priv->desired_essid, 0, sizeof(priv->desired_essid));

	memset(priv->desired_essid, 0, sizeof(priv->desired_essid));





	/* If not ANY, get the new ESSID */

	/* If not ANY, get the new ESSID */

	if (erq->flags) {

	if (erq->flags)

		memcpy(priv->desired_essid, essidbuf, erq->length);

		memcpy(priv->desired_essid, essidbuf, erq->length);

	}





	orinoco_unlock(priv, &flags);

	orinoco_unlock(priv, &flags);
@@ -4393,9 +4390,8 @@ static int orinoco_ioctl_getfreq(struct net_device *dev, 




	/* Locking done in there */

	/* Locking done in there */

	tmp = orinoco_hw_get_freq(priv);

	tmp = orinoco_hw_get_freq(priv);

	if (tmp < 0) {

	if (tmp < 0)

		return tmp;

		return tmp;

	}





	frq->m = tmp * 100000;

	frq->m = tmp * 100000;

	frq->e = 1;

	frq->e = 1;