The driver name was hardcoded and not same as the kernel module file
being build. Although there may be no strong requirement to this it
may provide increased consistency.
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Reviewed-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
---
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +-
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 28ddf1b..29fff59 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -149,7 +149,7 @@ static struct platform_driver wifi_device = {
.suspend = wifi_suspend,
.resume = wifi_resume,
.driver = {
- .name = "bcm4329_wlan",
+ .name = KBUILD_MODNAME,
}
};
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 6bc6207..f9ba048 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1184,14 +1184,14 @@ static void wl_remove(struct pci_dev *pdev)
}
static struct pci_driver wl_pci_driver = {
- .name = "brcm80211",
- .probe = wl_pci_probe,
+ .name = KBUILD_MODNAME,
+ .probe = wl_pci_probe,
#ifdef LINUXSTA_PS
- .suspend = wl_suspend,
- .resume = wl_resume,
+ .suspend = wl_suspend,
+ .resume = wl_resume,
#endif /* LINUXSTA_PS */
- .remove = __devexit_p(wl_remove),
- .id_table = wl_id_table,
+ .remove = __devexit_p(wl_remove),
+ .id_table = wl_id_table,
};
/**
--
1.7.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
