staging: brcm80211: use KBUILD_MODNAME as driver name in registration
authorArend van Spriel <arend@broadcom.com>
Fri, 21 Jan 2011 09:54:52 +0000 (10:54 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 21 Jan 2011 20:03:21 +0000 (12:03 -0800)
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@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

index 28ddf1b69aacea1a6f8a95b425750be066651232..29fff596c1687e75e87dcc20c01ff79dad43594b 100644 (file)
@@ -149,7 +149,7 @@ static struct platform_driver wifi_device = {
        .suspend = wifi_suspend,
        .resume = wifi_resume,
        .driver = {
-                  .name = "bcm4329_wlan",
+                  .name = KBUILD_MODNAME,
                   }
 };
 
index 6bc6207bab3eb0dd86fe4ebe7c54661016f1ebc9..f9ba048837be18b9a382077f9726249706896494 100644 (file)
@@ -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,
 };
 
 /**