mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

staging: ks7010: fix checkpatch UNNECESSARY_ELSE

Browse source 
Checkpatch emits WARNING: else is not generally useful after a break
or return. Two warnings of this type are emitted for this code block,
in both cases 'else' statements are unnecessary.

Remove unnecessary 'else' statements, reduce indentation in subsequent
code.

Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tobin C. Harding 2017-04-10 13:15:53 +10:00 committed by Greg Kroah-Hartman
parent 8f0ef774b8
commit ba9328768b
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/staging/ks7010/ks_wlan_net.c
View file

@ -202,6 +202,7 @@ static int ks_wlan_set_freq(struct net_device *dev,
{
struct ks_wlan_private *priv =
(struct ks_wlan_private *)netdev_priv(dev);
int channel;
if (priv->sleep_mode == SLP_SLEEP)
return -EPERM;
@ -220,25 +221,23 @@ static int ks_wlan_set_freq(struct net_device *dev,
fwrq->m = c + 1;
}
/* Setting by channel number */
if ((fwrq->m > 1000) || (fwrq->e > 0)) {
if ((fwrq->m > 1000) || (fwrq->e > 0))
return -EOPNOTSUPP;
} else {
int channel = fwrq->m;
/* We should do a better check than that,
* based on the card capability !!!
*/
if ((channel < 1) || (channel > 14)) {
netdev_dbg(dev,
"%s: New channel value of %d is invalid!\n",
dev->name, fwrq->m);
return -EINVAL;
} else {
/* Yes ! We can set it !!! */
priv->reg.channel = (u8)(channel);
priv->need_commit |= SME_MODE_SET;
}
channel = fwrq->m;
/* We should do a better check than that,
* based on the card capability !!!
*/
if ((channel < 1) || (channel > 14)) {
netdev_dbg(dev, "%s: New channel value of %d is invalid!\n",
dev->name, fwrq->m);
return -EINVAL;
}
/* Yes ! We can set it !!! */
priv->reg.channel = (u8)(channel);
priv->need_commit |= SME_MODE_SET;
return -EINPROGRESS; /* Call commit handler */
}