From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from s131.mittwaldmedien.de ([62.216.178.31]:21610 "EHLO s131.mittwaldmedien.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753766AbYDBQHd (ORCPT ); Wed, 2 Apr 2008 12:07:33 -0400 From: Holger Schurig To: libertas-dev@lists.infradead.org Subject: [PATCH] libertas: remove lbs_get_fwversion() Date: Wed, 2 Apr 2008 18:04:35 +0200 Cc: Dan Williams , linux-wireless@vger.kernel.org, "John W. Linville" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Message-Id: <200804021804.35559.hs4233@mail.mn-solutions.de> (sfid-20080402_170737_274525_26DD4C64) Sender: linux-wireless-owner@vger.kernel.org List-ID: It was used only at one place anyway. Signed-off-by: Holger Schurig Index: wireless-testing/drivers/net/wireless/libertas/ethtool.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/libertas/ethtool.c 2008-04-02 15:56:13.000000000 +0200 +++ wireless-testing/drivers/net/wireless/libertas/ethtool.c 2008-04-02 16:00:35.000000000 +0200 @@ -24,13 +24,14 @@ static void lbs_ethtool_get_drvinfo(stru 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. Index: wireless-testing/drivers/net/wireless/libertas/decl.h =================================================================== --- wireless-testing.orig/drivers/net/wireless/libertas/decl.h 2008-04-02 15:59:57.000000000 +0200 +++ wireless-testing/drivers/net/wireless/libertas/decl.h 2008-04-02 16:00:01.000000000 +0200 @@ -37,9 +37,6 @@ void lbs_notify_command_response(struct 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_command_response(struct lbs_private *priv, u8 *data, u32 len); Index: wireless-testing/drivers/net/wireless/libertas/wext.c =================================================================== --- wireless-testing.orig/drivers/net/wireless/libertas/wext.c 2008-04-02 15:56:20.000000000 +0200 +++ wireless-testing/drivers/net/wireless/libertas/wext.c 2008-04-02 16:00:25.000000000 +0200 @@ -2060,23 +2060,6 @@ static int lbs_set_wap(struct net_device 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 */