From 2a5053c91b35a6bbfc96b3b6e3200a67fbd83167 Mon Sep 17 00:00:00 2001
From: Holger Schurig <hs4233@mail.mn-solutions.de>
Date: Wed, 2 Apr 2008 18:04:35 +0200
Subject: [PATCH] --- yaml --- r: 90563 b: refs/heads/master c:
 fb14a7e0860ef8b19d0dd61be96e23eacb4da129 h: refs/heads/master i:   90561:
 e762ce22e21747e19070afe62e776b976ec25c97   90559:
 8966984f7cb03b04111f4d36dd331742f18b856f v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/wireless/libertas/decl.h    |  3 ---
 trunk/drivers/net/wireless/libertas/ethtool.c |  9 +++++----
 trunk/drivers/net/wireless/libertas/wext.c    | 17 -----------------
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index c90d70860af6..439873666a81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73ab1f25d4a3a22a1547d44199c2171c04e59cb8
+refs/heads/master: fb14a7e0860ef8b19d0dd61be96e23eacb4da129
diff --git a/trunk/drivers/net/wireless/libertas/decl.h b/trunk/drivers/net/wireless/libertas/decl.h
index 1ca747b28ef5..4aea421f07ce 100644
--- a/trunk/drivers/net/wireless/libertas/decl.h
+++ b/trunk/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/trunk/drivers/net/wireless/libertas/ethtool.c b/trunk/drivers/net/wireless/libertas/ethtool.c
index be226c1885a9..dcfdb404678b 100644
--- a/trunk/drivers/net/wireless/libertas/ethtool.c
+++ b/trunk/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/trunk/drivers/net/wireless/libertas/wext.c b/trunk/drivers/net/wireless/libertas/wext.c
index 4ab5b8523ed9..0973d015a520 100644
--- a/trunk/drivers/net/wireless/libertas/wext.c
+++ b/trunk/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
  */