From: Sergio Paracuellos Date: Wed, 25 Apr 2018 14:01:45 +0000 (+0200) Subject: staging: ks7010: refactor ks_wlan_set_cts_mode function X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bf338a9054a48bdc48e05ef1dc960889097a32f2;p=openwrt%2Fstaging%2Fblogic.git staging: ks7010: refactor ks_wlan_set_cts_mode function This commit refactors ks_wlan_set_cts_mode function to handle invalid values first and then assign the good one changing a bit logic to use a ternary operator. Signed-off-by: Sergio Paracuellos Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 87c051958bf3..a398b6a2b3e3 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -2030,18 +2030,13 @@ static int ks_wlan_set_cts_mode(struct net_device *dev, if (priv->sleep_mode == SLP_SLEEP) return -EPERM; /* for SLEEP MODE */ - if (*uwrq == CTS_MODE_FALSE) { /* 0 */ - priv->reg.cts_mode = CTS_MODE_FALSE; - } else if (*uwrq == CTS_MODE_TRUE) { /* 1 */ - if (priv->reg.phy_type == D_11G_ONLY_MODE || - priv->reg.phy_type == D_11BG_COMPATIBLE_MODE) { - priv->reg.cts_mode = CTS_MODE_TRUE; - } else { - priv->reg.cts_mode = CTS_MODE_FALSE; - } - } else { + if (*uwrq != CTS_MODE_FALSE && *uwrq != CTS_MODE_TRUE) return -EINVAL; - } + + priv->reg.cts_mode = (*uwrq == CTS_MODE_FALSE) ? *uwrq : + (priv->reg.phy_type == D_11G_ONLY_MODE || + priv->reg.phy_type == D_11BG_COMPATIBLE_MODE) ? + *uwrq : !*uwrq; priv->need_commit |= SME_MODE_SET; return -EINPROGRESS; /* Call commit handler */