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

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

libertas: remove lbs_get_fwversion() 



It was used only at one place anyway.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 73ab1f25

drivers/net/wireless/libertas/decl.h

+0 −3
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ void lbs_interrupt(struct lbs_private *priv); 
int lbs_set_radio_control(struct lbs_private *priv);

u32 lbs_fw_index_to_data_rate(u8 index);

u8 lbs_data_rate_to_fw_index(u32 rate);

void lbs_get_fwversion(struct lbs_private *priv,

	char *fwversion,

	int maxlen);



/** The proc fs interface */

int lbs_process_rx_command(struct lbs_private *priv);

drivers/net/wireless/libertas/ethtool.c

+5 −4
Original line number Diff line number Diff line
@@ -24,13 +24,14 @@ static void lbs_ethtool_get_drvinfo(struct net_device *dev, 
					 struct ethtool_drvinfo *info)

{

	struct lbs_private *priv = (struct lbs_private *) dev->priv;

	char fwver[32];



	lbs_get_fwversion(priv, fwver, sizeof(fwver) - 1);



	snprintf(info->fw_version, 32, "%u.%u.%u.p%u",

		priv->fwrelease >> 24 & 0xff,

		priv->fwrelease >> 16 & 0xff,

		priv->fwrelease >>  8 & 0xff,

		priv->fwrelease       & 0xff);

	strcpy(info->driver, "libertas");

	strcpy(info->version, lbs_driver_version);

	strcpy(info->fw_version, fwver);

}



/* All 8388 parts have 16KiB EEPROM size at the time of writing.

drivers/net/wireless/libertas/wext.c

+0 −17
Original line number Diff line number Diff line
@@ -2060,23 +2060,6 @@ static int lbs_set_wap(struct net_device *dev, struct iw_request_info *info, 
	return ret;

}



void lbs_get_fwversion(struct lbs_private *priv, char *fwversion, int maxlen)

{

	char fwver[32];



	mutex_lock(&priv->lock);



	sprintf(fwver, "%u.%u.%u.p%u",

		priv->fwrelease >> 24 & 0xff,

		priv->fwrelease >> 16 & 0xff,

		priv->fwrelease >>  8 & 0xff,

		priv->fwrelease       & 0xff);



	mutex_unlock(&priv->lock);

	snprintf(fwversion, maxlen, fwver);

}





/*

 * iwconfig settable callbacks

 */