Both SoftMAC and FullMAC driver print information upon loading containing description and version number. The descriptive text has been aligned with the descriptive text used in Kconfig.
Signed-off-by: Arend van Spriel <[email protected]> --- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 16 ++++++---------- drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 11 +++++------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 80ed1a7..0266365 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) */ @@ -2126,7 +2120,11 @@ dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus, dhd->early_suspend.resume = dhd_late_resume; register_early_suspend(&dhd->early_suspend); #endif - + DHD_ERROR(("Broadcom IEEE802.11n embedded FullMAC WLAN Driver, " + "version " EPI_VERSION_STR "\n")); +#ifdef DHD_DEBUG + DHD_ERROR(("Compiled at " __TIME__ " on " __DATE__ "\n")); +#endif return &dhd->pub; fail: @@ -2499,9 +2497,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/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index f9ba048..e8b3505 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c @@ -768,18 +768,17 @@ 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); + WL_ERROR("wl%d: Broadcom IEEE802.11n PCIe SoftMAC WLAN Driver, " + "version " PHY_VERSION_STR "\n", unit); #ifdef BCMDBG - printf(" (Compiled at " __TIME__ " on " __DATE__ ")"); -#endif /* BCMDBG */ - printf("\n"); + WL_ERROR("wl%d: Compiled at " __TIME__ " on " __DATE__ "\n", unit); +#endif /* BCMDBG */ wl_found++; return wl; - fail: +fail: wl_free(wl); fail1: return NULL; -- 1.7.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
