From: Andres Salomon <dilinger@debian.org>
Date: Tue, 20 Nov 2007 22:43:32 +0000 (-0500)
Subject: libertas: drop useless default_fw_name variable
X-Git-Tag: v2.6.25-rc1~1162^2~539
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82209adcb157e5861f2105d1658f1f07f75d69f2;p=linux-2.6

libertas: drop useless default_fw_name variable

Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 797d3fbf71..6d19d26770 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -19,9 +19,8 @@
 #define MESSAGE_HEADER_LEN	4
 
 static const char usbdriver_name[] = "usb8xxx";
-static u8 *default_fw_name = "usb8388.bin";
 
-static char *lbs_fw_name;
+static char *lbs_fw_name = "usb8388.bin";
 module_param_named(fw_name, lbs_fw_name, charp, 0644);
 
 /*
@@ -1027,10 +1026,6 @@ static int if_usb_init_module(void)
 
 	lbs_deb_enter(LBS_DEB_MAIN);
 
-	if (lbs_fw_name == NULL) {
-		lbs_fw_name = default_fw_name;
-	}
-
 	ret = usb_register(&if_usb_driver);
 
 	lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);