libertas: remove lbs_get_fwversion()

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>

diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index 1ca747b28ef5bec2496c681e5bb2604fe7878ea7..4aea421f07ce666b0de07a5ad6ce4336d53189b4 100644 (file)
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -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);

diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index be226c1885a9c04f4ee74a36a92c9fa95c1d33d6..dcfdb404678b796717fcf63a79018e3fbfb39bd0 100644 (file)
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -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.

diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 4ab5b8523ed9a4de061b692180acb0be3f7995fd..0973d015a5201e7dc604f1c86229c25b5a6bc265 100644 (file)
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -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
  */