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>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index be226c1885a9..dcfdb404678b 100644
--- 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.