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

Commit ef85ad54 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: remove lbs_get_data_rate() 



lbs_get_data_rate() gets called, but no-one uses it's result.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6dcdc19e

drivers/net/wireless/libertas/cmd.c

+0 −32
Original line number Diff line number Diff line
@@ -696,38 +696,6 @@ static int lbs_cmd_802_11_rate_adapt_rateset(struct lbs_private *priv, 
	return 0;

}



/**

 *  @brief Get the current data rate

 *

 *  @param priv    	A pointer to struct lbs_private structure

 *

 *  @return 	   	The data rate on success, error on failure

 */

int lbs_get_data_rate(struct lbs_private *priv)

{

	struct cmd_ds_802_11_data_rate cmd;

	int ret = -1;



	lbs_deb_enter(LBS_DEB_CMD);



	memset(&cmd, 0, sizeof(cmd));

	cmd.hdr.size = cpu_to_le16(sizeof(cmd));

	cmd.action = cpu_to_le16(CMD_ACT_GET_TX_RATE);



	ret = lbs_cmd_with_response(priv, CMD_802_11_DATA_RATE, &cmd);

	if (ret)

		goto out;



	lbs_deb_hex(LBS_DEB_CMD, "DATA_RATE_RESP", (u8 *) &cmd, sizeof (cmd));



	ret = (int) lbs_fw_index_to_data_rate(cmd.rates[0]);

	lbs_deb_cmd("DATA_RATE: current rate 0x%02x\n", ret);



out:

	lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);

	return ret;

}



/**

 *  @brief Set the data rate

 *

drivers/net/wireless/libertas/cmd.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ int lbs_update_hw_spec(struct lbs_private *priv); 
int lbs_mesh_access(struct lbs_private *priv, uint16_t cmd_action,

		    struct cmd_ds_mesh_access *cmd);



int lbs_get_data_rate(struct lbs_private *priv);

int lbs_set_data_rate(struct lbs_private *priv, u8 rate);



int lbs_get_channel(struct lbs_private *priv);

drivers/net/wireless/libertas/main.c

+1 −11
Original line number Diff line number Diff line
@@ -927,20 +927,10 @@ static int lbs_setup_firmware(struct lbs_private *priv) 
	 */

	memset(priv->current_addr, 0xff, ETH_ALEN);

	ret = lbs_update_hw_spec(priv);

	if (ret) {

		ret = -1;

	if (ret)

		goto done;

	}



	lbs_set_mac_control(priv);



	ret = lbs_get_data_rate(priv);

	if (ret < 0) {

		ret = -1;

		goto done;

	}



	ret = 0;

done:

	lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret);

	return ret;