Skip to content

Commit

Permalink
libertas: remove lbs_get_fwversion()
Browse files Browse the repository at this point in the history
It was used only at one place anyway.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Holger Schurig authored and John W. Linville committed Apr 8, 2008
1 parent 73ab1f2 commit fb14a7e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 24 deletions.
3 changes: 0 additions & 3 deletions drivers/net/wireless/libertas/decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 5 additions & 4 deletions drivers/net/wireless/libertas/ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
17 changes: 0 additions & 17 deletions drivers/net/wireless/libertas/wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down

0 comments on commit fb14a7e

Please sign in to comment.