Remove differences in util sources for the two supported drivers
and remove default print statements.
Cc: Brett Rudley <brudley@xxxxxxxxxxxx>
Cc: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Cc: Roland Vossen <rvossen@xxxxxxxxxxxx>
Cc: Dowan Kim <dowan@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
---
drivers/staging/brcm80211/Kconfig | 14 +++++++-------
drivers/staging/brcm80211/Makefile | 5 +++--
drivers/staging/brcm80211/brcmfmac/Makefile | 9 ++++++---
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 10 +---------
drivers/staging/brcm80211/brcmsmac/Makefile | 3 +--
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 7 -------
drivers/staging/brcm80211/util/aiutils.c | 4 ----
drivers/staging/brcm80211/util/hndpmu.c | 11 +++++------
8 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig
index 3208352..b6f8635 100644
--- a/drivers/staging/brcm80211/Kconfig
+++ b/drivers/staging/brcm80211/Kconfig
@@ -2,12 +2,6 @@ menuconfig BRCM80211
tristate "Broadcom IEEE802.11n WLAN drivers"
depends on WLAN
-choice
- prompt "Broadcom IEEE802.11n driver style"
- depends on BRCM80211
- help
- Select the appropriate driver style from the list below.
-
config BRCMSMAC
bool "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
depends on PCI
@@ -30,4 +24,10 @@ config BRCMFMAC
Broadcom IEEE802.11n FullMAC chipsets. This driver uses the kernel's
wireless extensions subsystem. If you choose to build a module,
it'll be called brcmfmac.ko.
-endchoice
+
+config BRCMDBG
+ bool "Broadcom driver debug functions"
+ default n
+ depends on BRCM80211
+ ---help---
+ Selecting this enables additional code for debug purposes.
diff --git a/drivers/staging/brcm80211/Makefile b/drivers/staging/brcm80211/Makefile
index 5caaea5..c064cdf 100644
--- a/drivers/staging/brcm80211/Makefile
+++ b/drivers/staging/brcm80211/Makefile
@@ -15,8 +15,9 @@
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# one and only common flag
-subdir-ccflags-y := -DBCMDBG
+# common flags
+subdir-ccflags-y := -DBCMDMA32
+subdir-ccflags-$(CONFIG_BRCMDBG) += -DBCMDBG -DBCMDBG_ASSERT
obj-$(CONFIG_BRCMFMAC) += brcmfmac/
obj-$(CONFIG_BRCMSMAC) += brcmsmac/
diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index 129ce57..040f4a7 100644
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -22,7 +22,6 @@ ccflags-y := \
-DBCMSDIO \
-DBDC \
-DBRCM_FULLMAC \
- -DDHD_DEBUG \
-DDHD_FIRSTREAD=64 \
-DDHD_SCHED \
-DDHD_SDALIGN=64 \
@@ -31,8 +30,12 @@ ccflags-y := \
-DMMC_SDIO_ABORT \
-DPKT_FILTER_SUPPORT \
-DSHOW_EVENTS \
- -DTOE \
- -Idrivers/staging/brcm80211/brcmfmac \
+ -DTOE
+
+ccflags-$(CONFIG_BRCMDBG) += -DDHD_DEBUG
+
+ccflags-y += \
+ -Idrivers/staging/brcm80211/brcmfmac \
-Idrivers/staging/brcm80211/include \
-Idrivers/staging/brcm80211/util
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 29fff59..7100d81 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -387,12 +387,6 @@ module_param(dhd_pktgen_len, uint, 0);
#define DHD_COMPILED
#endif
-static char dhd_version[] = "Dongle Host Driver, version " EPI_VERSION_STR
-#ifdef DHD_DEBUG
-"\nCompiled in " " on " __DATE__ " at " __TIME__
-#endif
-;
-
#if defined(CONFIG_WIRELESS_EXT)
struct iw_statistics *dhd_get_wireless_stats(struct net_device *dev);
#endif /* defined(CONFIG_WIRELESS_EXT) */
@@ -2466,9 +2460,7 @@ static int __init dhd_module_init(void)
error = dhd_bus_register();
- if (!error)
- printf("\n%s\n", dhd_version);
- else {
+ if (error) {
DHD_ERROR(("%s: sdio_register_driver failed\n", __func__));
goto faild;
}
diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index ea29702..5da39be 100644
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -15,14 +15,13 @@
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-ccflags-y := \
+ccflags-y := \
-DWLC_HIGH \
-DWLC_LOW \
-DSTA \
-DWME \
-DWL11N \
-DDBAND \
- -DBCMDMA32 \
-DBCMNVRAMR \
-Idrivers/staging/brcm80211/brcmsmac \
-Idrivers/staging/brcm80211/brcmsmac/phy \
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 6505732..1b33e65 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -738,13 +738,6 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
WL_ERROR("%s: regulatory_hint failed, status %d\n",
__func__, err);
}
- WL_ERROR("wl%d: Broadcom BCM43xx 802.11 MAC80211 Driver (" PHY_VERSION_STR ")",
- unit);
-
-#ifdef BCMDBG
- printf(" (Compiled at " __TIME__ " on " __DATE__ ")");
-#endif /* BCMDBG */
- printf("\n");
wl_found++;
return wl;
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c
index b6e7a9e..e4842c1 100644
--- a/drivers/staging/brcm80211/util/aiutils.c
+++ b/drivers/staging/brcm80211/util/aiutils.c
@@ -131,10 +131,8 @@ void ai_scan(si_t *sih, void *regs, uint devid)
eromptr = regs;
break;
-#ifdef BCMSDIO
case SPI_BUS:
case SDIO_BUS:
-#endif /* BCMSDIO */
eromptr = (u32 *)(unsigned long)erombase;
break;
@@ -355,10 +353,8 @@ void *ai_setcoreidx(si_t *sih, uint coreidx)
pci_write_config_dword(sii->osh->pdev, PCI_BAR0_WIN2, wrap);
break;
-#ifdef BCMSDIO
case SPI_BUS:
case SDIO_BUS:
-#endif /* BCMSDIO */
sii->curmap = regs = (void *)(unsigned long)addr;
sii->curwrap = (void *)(unsigned long)wrap;
break;
diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c
index 49d19a1..2678d79 100644
--- a/drivers/staging/brcm80211/util/hndpmu.c
+++ b/drivers/staging/brcm80211/util/hndpmu.c
@@ -32,6 +32,10 @@
#ifdef BCMDBG
#define PMU_MSG(args) printf args
+
+/* debug-only definitions */
+/* #define BCMDBG_FORCEHT */
+/* #define CHIPC_UART_ALWAYS_ON */
#else
#define PMU_MSG(args)
#endif /* BCMDBG */
@@ -2504,12 +2508,7 @@ bool si_pmu_is_otp_powered(si_t *sih, struct osl_info *osh)
return st;
}
-void
-#if defined(BCMDBG)
-si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable)
-#else
-si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable)
-#endif
+void si_pmu_sprom_enable(si_t *sih, struct osl_info *osh, bool enable)
{
chipcregs_t *cc;
uint origidx;
--
1.7.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
