* [PATCH 1/4] libertas: drop useless default_fw_name variable
@ 2007-11-16 18:11 Andres Salomon
2007-11-20 22:23 ` Dan Williams
0 siblings, 1 reply; 2+ messages in thread
From: Andres Salomon @ 2007-11-16 18:11 UTC (permalink / raw)
To: libertas-dev; +Cc: linux-wireless, Marcelo Tosatti, David Woodhouse, akpm
Signed-off-by: Andres Salomon <dilinger@debian.org>
---
drivers/net/wireless/libertas/if_usb.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 063572f..3cf9379 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -20,9 +20,8 @@
#define MESSAGE_HEADER_LEN 4
static const char usbdriver_name[] = "usb8xxx";
-static u8 *default_fw_name = "usb8388.bin";
-static char *libertas_fw_name = NULL;
+static char *libertas_fw_name = "usb8388.bin";
module_param_named(fw_name, libertas_fw_name, charp, 0644);
/*
@@ -1129,10 +1128,6 @@ static int if_usb_init_module(void)
lbs_deb_enter(LBS_DEB_MAIN);
- if (libertas_fw_name == NULL) {
- libertas_fw_name = default_fw_name;
- }
-
ret = usb_register(&if_usb_driver);
lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 1/4] libertas: drop useless default_fw_name variable
2007-11-16 18:11 [PATCH 1/4] libertas: drop useless default_fw_name variable Andres Salomon
@ 2007-11-20 22:23 ` Dan Williams
0 siblings, 0 replies; 2+ messages in thread
From: Dan Williams @ 2007-11-20 22:23 UTC (permalink / raw)
To: Andres Salomon
Cc: libertas-dev, Marcelo Tosatti, David Woodhouse, akpm,
linux-wireless
On Fri, 2007-11-16 at 13:11 -0500, Andres Salomon wrote:
> Signed-off-by: Andres Salomon <dilinger@debian.org>
As discussed on IRC, I'll clean this series of 4 patches up for 2.6.25
and the unified libertas namespace and resubmit. Thanks!
Dan
> ---
> drivers/net/wireless/libertas/if_usb.c | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
> index 063572f..3cf9379 100644
> --- a/drivers/net/wireless/libertas/if_usb.c
> +++ b/drivers/net/wireless/libertas/if_usb.c
> @@ -20,9 +20,8 @@
> #define MESSAGE_HEADER_LEN 4
>
> static const char usbdriver_name[] = "usb8xxx";
> -static u8 *default_fw_name = "usb8388.bin";
>
> -static char *libertas_fw_name = NULL;
> +static char *libertas_fw_name = "usb8388.bin";
> module_param_named(fw_name, libertas_fw_name, charp, 0644);
>
> /*
> @@ -1129,10 +1128,6 @@ static int if_usb_init_module(void)
>
> lbs_deb_enter(LBS_DEB_MAIN);
>
> - if (libertas_fw_name == NULL) {
> - libertas_fw_name = default_fw_name;
> - }
> -
> ret = usb_register(&if_usb_driver);
>
> lbs_deb_leave_args(LBS_DEB_MAIN, "ret %d", ret);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-20 22:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-16 18:11 [PATCH 1/4] libertas: drop useless default_fw_name variable Andres Salomon
2007-11-20 22:23 ` Dan Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox