提交 08960dea 编写于 作者: J Johannes Berg 提交者: John W. Linville

iwlagn: remove pointless return variables

A number of places just use a variable to return
it right away, which is useless, so let's remove
the variables there.
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
Signed-off-by: NWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 4de10b18
...@@ -2771,16 +2771,13 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta, ...@@ -2771,16 +2771,13 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
static void *rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta, static void *rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta,
gfp_t gfp) gfp_t gfp)
{ {
struct iwl_lq_sta *lq_sta;
struct iwl_station_priv *sta_priv = (struct iwl_station_priv *) sta->drv_priv; struct iwl_station_priv *sta_priv = (struct iwl_station_priv *) sta->drv_priv;
struct iwl_priv *priv; struct iwl_priv *priv;
priv = (struct iwl_priv *)priv_rate; priv = (struct iwl_priv *)priv_rate;
IWL_DEBUG_RATE(priv, "create station rate scale window\n"); IWL_DEBUG_RATE(priv, "create station rate scale window\n");
lq_sta = &sta_priv->lq_sta; return &sta_priv->lq_sta;
return lq_sta;
} }
/* /*
...@@ -3259,7 +3256,6 @@ static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file, ...@@ -3259,7 +3256,6 @@ static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file,
{ {
char buff[120]; char buff[120];
int desc = 0; int desc = 0;
ssize_t ret;
struct iwl_lq_sta *lq_sta = file->private_data; struct iwl_lq_sta *lq_sta = file->private_data;
struct iwl_priv *priv; struct iwl_priv *priv;
...@@ -3276,8 +3272,7 @@ static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file, ...@@ -3276,8 +3272,7 @@ static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file,
"Bit Rate= %d Mb/s\n", "Bit Rate= %d Mb/s\n",
iwl_rates[lq_sta->last_txrate_idx].ieee >> 1); iwl_rates[lq_sta->last_txrate_idx].ieee >> 1);
ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc); return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
return ret;
} }
static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = { static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
......
...@@ -653,7 +653,5 @@ int iwl_verify_ucode(struct iwl_priv *priv) ...@@ -653,7 +653,5 @@ int iwl_verify_ucode(struct iwl_priv *priv)
* Selection of bootstrap image (vs. other images) is arbitrary. */ * Selection of bootstrap image (vs. other images) is arbitrary. */
image = (__le32 *)priv->ucode_boot.v_addr; image = (__le32 *)priv->ucode_boot.v_addr;
len = priv->ucode_boot.len; len = priv->ucode_boot.len;
ret = iwl_verify_inst_full(priv, image, len); return iwl_verify_inst_full(priv, image, len);
return ret;
} }
...@@ -1572,12 +1572,10 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file, ...@@ -1572,12 +1572,10 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file,
int pos = 0; int pos = 0;
char buf[200]; char buf[200];
const size_t bufsz = sizeof(buf); const size_t bufsz = sizeof(buf);
ssize_t ret;
if (!priv->bt_enable_flag) { if (!priv->bt_enable_flag) {
pos += scnprintf(buf + pos, bufsz - pos, "BT coex disabled\n"); pos += scnprintf(buf + pos, bufsz - pos, "BT coex disabled\n");
ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
return ret;
} }
pos += scnprintf(buf + pos, bufsz - pos, "BT enable flag: 0x%x\n", pos += scnprintf(buf + pos, bufsz - pos, "BT enable flag: 0x%x\n",
priv->bt_enable_flag); priv->bt_enable_flag);
...@@ -1608,8 +1606,7 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file, ...@@ -1608,8 +1606,7 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file,
break; break;
} }
ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
return ret;
} }
static ssize_t iwl_dbgfs_protection_mode_read(struct file *file, static ssize_t iwl_dbgfs_protection_mode_read(struct file *file,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册