b43: drop Kconfig option of forcing PIO mode

We have module param called use_pio which is much easier to use.

Cc: Larry Finger <larry.finger@lwfinger.net>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index b81a2a1c26181cd1135d005903736f1f19e4d0a5..df2b7c0856ede670d197ec9d85bb60a6d6d70e33 100644 (file)
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -169,13 +169,3 @@ config B43_DEBUG
          Say N, if you are a distributor or user building a release kernel
          for production use.
          Only say Y, if you are debugging a problem in the b43 driver sourcecode.
-
-config B43_FORCE_PIO
-       bool "Force usage of PIO instead of DMA"
-       depends on B43 && B43_DEBUG
-       ---help---
-         This will disable DMA and always enable PIO instead.
-
-         Say N!
-         This is only for debugging the PIO engine code. You do
-         _NOT_ want to enable this.

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 8a5265711b8c9e3fb709d3e27e5bb5211d951a64..8ff706289b5db6b8886c1559528ae23e575acde3 100644 (file)
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -970,12 +970,6 @@ static inline bool b43_using_pio_transfers(struct b43_wldev *dev)
        return dev->__using_pio_transfers;
 }
 
-#ifdef CONFIG_B43_FORCE_PIO
-# define B43_PIO_DEFAULT 1
-#else
-# define B43_PIO_DEFAULT 0
-#endif
-
 /* Message printing */
 void b43info(struct b43_wl *wl, const char *fmt, ...)
     __attribute__ ((format(printf, 2, 3)));

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 06289019a1aa867fc4514ec777b00689615a0424..d2b1d1fe202b867b7716e65e26c2675d962fcb10 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -107,7 +107,7 @@ int b43_modparam_verbose = B43_VERBOSITY_DEFAULT;
 module_param_named(verbose, b43_modparam_verbose, int, 0644);
 MODULE_PARM_DESC(verbose, "Log message verbosity: 0=error, 1=warn, 2=info(default), 3=debug");
 
-static int b43_modparam_pio = B43_PIO_DEFAULT;
+static int b43_modparam_pio = 0;
 module_param_named(pio, b43_modparam_pio, int, 0644);
 MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");