From 1140bd9f30f4d6dac6b53365a70819ecd4cc8c54 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 28 Nov 2010 22:59:57 +0200 Subject: [PATCH] Staging: w35und: Kill _USE_FALLBACK_RATE_ macro The _USE_FALLBACK_RATE_ macro parametrizes DEFAULT_RATE_RETRY_LIMIT. It's only used in Mxx_initial() in reg.c where _USE_FALLBACK_RATE_ is always defined because the reg.c file includes sysdef.h at the top. It's therefore safe to remove the _USE_FALLBACK_RATE_ macro. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/sysdef.h | 2 -- drivers/staging/winbond/wb35reg_s.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/drivers/staging/winbond/sysdef.h b/drivers/staging/winbond/sysdef.h index 7198708108bb..f8d8606a4efa 100644 --- a/drivers/staging/winbond/sysdef.h +++ b/drivers/staging/winbond/sysdef.h @@ -3,8 +3,6 @@ #ifndef SYS_DEF_H #define SYS_DEF_H -#define _USE_FALLBACK_RATE_ - #define _WPA2_ /* debug print options, mark what debug you don't need */ diff --git a/drivers/staging/winbond/wb35reg_s.h b/drivers/staging/winbond/wb35reg_s.h index 9d5993bfc1f4..9b782ededf43 100644 --- a/drivers/staging/winbond/wb35reg_s.h +++ b/drivers/staging/winbond/wb35reg_s.h @@ -51,11 +51,7 @@ struct hw_data; #define DEFAULT_CWMAX 1023 /* (M2C) CWmax. Its value is in the range 0-1023. */ #define DEFAULT_AID 1 /* (M34) AID. Its value is in the range 1-2007. */ -#ifdef _USE_FALLBACK_RATE_ #define DEFAULT_RATE_RETRY_LIMIT 2 /* (M38) as named */ -#else -#define DEFAULT_RATE_RETRY_LIMIT 7 /* (M38) as named */ -#endif #define DEFAULT_LONG_RETRY_LIMIT 7 /* (M38) LongRetryLimit. Its value is in the range 0-15. */ #define DEFAULT_SHORT_RETRY_LIMIT 7 /* (M38) ShortRetryLimit. Its value is in the range 0-15. */ -- 2.39.2