[PATCH 333/510] Staging: w35und: Kill _USE_FALLBACK_RATE_ macro
Greg Kroah-Hartman
gregkh at suse.de
Mon Jan 10 20:40:57 UTC 2011
From: Pekka Enberg <penberg at kernel.org>
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 <pavel at ucw.cz>
Signed-off-by: Pekka Enberg <penberg at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/winbond/sysdef.h | 2 --
drivers/staging/winbond/wb35reg_s.h | 4 ----
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/winbond/sysdef.h b/drivers/staging/winbond/sysdef.h
index 7198708..f8d8606 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 9d5993b..9b782ed 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. */
--
1.7.3.2
More information about the devel
mailing list