[PATCH 1/4] libertas: drop useless default_fw_name variable

Dan Williams dcbw at redhat.com
Tue Nov 20 17:23:14 EST 2007


On Fri, 2007-11-16 at 13:11 -0500, Andres Salomon wrote:
> Signed-off-by: Andres Salomon <dilinger at 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);




More information about the libertas-dev mailing list