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

Commit 08960dea authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4de10b18

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+2 −7
Original line number Diff line number Diff line
@@ -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,

			  gfp_t gfp)

{

	struct iwl_lq_sta *lq_sta;

	struct iwl_station_priv *sta_priv = (struct iwl_station_priv *) sta->drv_priv;

	struct iwl_priv *priv;



	priv = (struct iwl_priv *)priv_rate;

	IWL_DEBUG_RATE(priv, "create station rate scale window\n");



	lq_sta = &sta_priv->lq_sta;



	return lq_sta;

	return &sta_priv->lq_sta;

}



/*
@@ -3259,7 +3256,6 @@ static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file, 
{

	char buff[120];

	int desc = 0;

	ssize_t ret;



	struct iwl_lq_sta *lq_sta = file->private_data;

	struct iwl_priv *priv;
@@ -3276,8 +3272,7 @@ static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file, 
				"Bit Rate= %d Mb/s\n",

				iwl_rates[lq_sta->last_txrate_idx].ieee >> 1);



	ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);

	return ret;

	return simple_read_from_buffer(user_buf, count, ppos, buff, desc);

}



static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {

drivers/net/wireless/iwlwifi/iwl-agn-ucode.c

+1 −3
Original line number Diff line number Diff line
@@ -653,7 +653,5 @@ int iwl_verify_ucode(struct iwl_priv *priv) 
	 * Selection of bootstrap image (vs. other images) is arbitrary. */

	image = (__le32 *)priv->ucode_boot.v_addr;

	len = priv->ucode_boot.len;

	ret = iwl_verify_inst_full(priv, image, len);



	return ret;

	return iwl_verify_inst_full(priv, image, len);

}

drivers/net/wireless/iwlwifi/iwl-debugfs.c

+2 −5
Original line number Diff line number Diff line
@@ -1572,12 +1572,10 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file, 
	int pos = 0;

	char buf[200];

	const size_t bufsz = sizeof(buf);

	ssize_t ret;



	if (!priv->bt_enable_flag) {

		pos += scnprintf(buf + pos, bufsz - pos, "BT coex disabled\n");

		ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);

		return ret;

		return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

	}

	pos += scnprintf(buf + pos, bufsz - pos, "BT enable flag: 0x%x\n",

		priv->bt_enable_flag);
@@ -1608,8 +1606,7 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file, 
		break;

	}



	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);

	return ret;

	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

}



static ssize_t iwl_dbgfs_protection_mode_read(struct file *file,