2024-04-16 11:59:37

by Karan Sanghavi

Subject: [PATCH] Staging : ks7010 ks_wlan_net : Fixed Unnecessary Paranthesis, Prefer Fallthrough and Line spacing issue.

Fixed a coding style issue.

Signed-off-by: Karan Sanghavi <[email protected]>
---
drivers/staging/ks7010/ks_wlan_net.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 0fb97a79ad0b..4b1b5d9b883b 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -12,7 +12,6 @@
#include <linux/netdevice.h>
#include <linux/timer.h>
#include <linux/uaccess.h>
-
static int wep_on_off;
#define WEP_OFF 0
#define WEP_ON_64BIT 1
@@ -181,26 +180,26 @@ static int ks_wlan_set_freq(struct net_device *dev,

/* for SLEEP MODE */
/* If setting by frequency, convert to a channel */
- if ((fwrq->freq.e == 1) &&
- (fwrq->freq.m >= 241200000) && (fwrq->freq.m <= 248700000)) {
+ if (fwrq->freq.e == 1 &&
+ fwrq->freq.m >= 241200000 && fwrq->freq.m <= 248700000) {
int f = fwrq->freq.m / 100000;
int c = 0;

while ((c < 14) && (f != frequency_list[c]))
c++;
- /* Hack to fall through... */
+ [[fallthough]];
fwrq->freq.e = 0;
fwrq->freq.m = c + 1;
}
/* Setting by channel number */
- if ((fwrq->freq.m > 1000) || (fwrq->freq.e > 0))
+ if (fwrq->freq.m > 1000 || fwrq->freq.e >)
return -EOPNOTSUPP;

channel = fwrq->freq.m;
/* We should do a better check than that,
* based on the card capability !!!
*/
- if ((channel < 1) || (channel > 14)) {
+ if (channel < 1 || channel > 14) {
netdev_dbg(dev, "%s: New channel value of %d is invalid!\n",
dev->name, fwrq->freq.m);
return -EINVAL;
@@ -663,7 +662,7 @@ static int ks_wlan_set_rts(struct net_device *dev, struct iw_request_info *info,
/* for SLEEP MODE */
if (vwrq->rts.disabled)
rthr = 2347;
- if ((rthr < 0) || (rthr > 2347))
+ if (rthr < 0 || rthr > 2347)
return -EINVAL;

priv->reg.rts = rthr;
@@ -701,7 +700,7 @@ static int ks_wlan_set_frag(struct net_device *dev,
/* for SLEEP MODE */
if (vwrq->frag.disabled)
fthr = 2346;
- if ((fthr < 256) || (fthr > 2346))
+ if (fthr < 256 || fthr > 2346)
return -EINVAL;

fthr &= ~0x1; /* Get an even value - is it really needed ??? */
@@ -780,7 +779,7 @@ static int ks_wlan_set_encode(struct net_device *dev,
return -EINVAL;

/* for SLEEP MODE */
- if ((index < 0) || (index > 4))
+ if (index < 0 || index > 4)
return -EINVAL;

index = (index == 0) ? priv->reg.wep_index : (index - 1);
@@ -881,7 +880,7 @@ static int ks_wlan_get_encode(struct net_device *dev,
}

/* Which key do we want ? -1 -> tx index */
- if ((index < 0) || (index >= 4))
+ if (index < 0 || index >= 4)
index = priv->reg.wep_index;
if (priv->reg.privacy_invoked) {
enc->flags &= ~IW_ENCODE_DISABLED;
@@ -1863,8 +1862,8 @@ static int ks_wlan_set_power_mgmt(struct net_device *dev,
uwrq->mode != POWER_MGMT_SAVE2)
return -EINVAL;

- if ((uwrq->mode == POWER_MGMT_SAVE1 || uwrq->mode == POWER_MGMT_SAVE2) &&
- (priv->reg.operation_mode != MODE_INFRASTRUCTURE))
+ if (uwrq->mode == POWER_MGMT_SAVE1 || uwrq->mode == POWER_MGMT_SAVE2 &&
+ priv->reg.operation_mode != MODE_INFRASTRUCTURE)
return -EINVAL;

priv->reg.power_mgmt = uwrq->mode;
--
2.40.1

2024-04-16 12:39:11

by Dan Carpenter

Subject: Re: [PATCH] Staging : ks7010 ks_wlan_net : Fixed Unnecessary Paranthesis, Prefer Fallthrough and Line spacing issue.

On Tue, Apr 16, 2024 at 05:29:03PM +0530, Karan Sanghavi wrote:
> Fixed a coding style issue.
>
> Signed-off-by: Karan Sanghavi <[email protected]>

Greg likes parentheses so leave those alone. The other changes are
wrong and also break the build.

regards,
dan carpenter