From 189aed097b1dc458d2290034fb3136147e64a1de Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Wed, 1 Jun 2011 13:45:07 +0200 Subject: [PATCH] staging: brcm80211: removed 'hnd' from filenames Cleanup. 'hnd' is a company specific acronym. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 2 +- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 8 ++++---- .../brcmfmac/{hndrte_armtrap.h => rte_armtrap.h} | 0 .../brcm80211/brcmfmac/{hndrte_cons.h => rte_cons.h} | 0 drivers/staging/brcm80211/brcmsmac/Makefile | 2 +- drivers/staging/brcm80211/brcmsmac/aiutils.c | 2 +- .../brcm80211/{include/hnddma.h => brcmsmac/bcmdma.h} | 0 drivers/staging/brcm80211/brcmsmac/bcmotp.c | 2 +- drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 2 +- drivers/staging/brcm80211/brcmsmac/{hnddma.c => dma.c} | 6 +++--- drivers/staging/brcm80211/brcmsmac/nicpci.c | 2 +- drivers/staging/brcm80211/brcmsmac/nvram.c | 2 +- drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 2 +- drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 2 +- drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 2 +- drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c | 2 +- drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c | 2 +- drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 4 ++-- drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 4 ++-- drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_main.c | 4 ++-- drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 4 ++-- drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 2 +- drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 2 +- drivers/staging/brcm80211/include/{hndsoc.h => bcmsoc.h} | 0 drivers/staging/brcm80211/include/{sbhnddma.h => sbdma.h} | 0 29 files changed, 33 insertions(+), 33 deletions(-) rename drivers/staging/brcm80211/brcmfmac/{hndrte_armtrap.h => rte_armtrap.h} (100%) rename drivers/staging/brcm80211/brcmfmac/{hndrte_cons.h => rte_cons.h} (100%) rename drivers/staging/brcm80211/{include/hnddma.h => brcmsmac/bcmdma.h} (100%) rename drivers/staging/brcm80211/brcmsmac/{hnddma.c => dma.c} (99%) rename drivers/staging/brcm80211/include/{hndsoc.h => bcmsoc.h} (100%) rename drivers/staging/brcm80211/include/{sbhnddma.h => sbdma.h} (100%) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 3750fcf5a871..e11c615d7494 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include /* BRCM API for SDIO clients (such as wl, dhd) */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 5d747b851ed7..fd4f34189e39 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -30,13 +30,13 @@ #include #include -#include +#include #ifdef DHD_DEBUG -#include -#include +#include +#include #endif /* DHD_DEBUG */ #include -#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h b/drivers/staging/brcm80211/brcmfmac/rte_armtrap.h similarity index 100% rename from drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h rename to drivers/staging/brcm80211/brcmfmac/rte_armtrap.h diff --git a/drivers/staging/brcm80211/brcmfmac/hndrte_cons.h b/drivers/staging/brcm80211/brcmfmac/rte_cons.h similarity index 100% rename from drivers/staging/brcm80211/brcmfmac/hndrte_cons.h rename to drivers/staging/brcm80211/brcmfmac/rte_cons.h diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile index 8d75fe19ca9a..4356a29a3f1c 100644 --- a/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/drivers/staging/brcm80211/brcmsmac/Makefile @@ -49,7 +49,7 @@ BRCMSMAC_OFILES := \ phy/wlc_phy_qmath.o \ bcmotp.o \ bcmsrom.o \ - hnddma.o \ + dma.o \ nicpci.o \ nvram.o diff --git a/drivers/staging/brcm80211/brcmsmac/aiutils.c b/drivers/staging/brcm80211/brcmsmac/aiutils.c index a61185f70a7c..73587b34e25a 100644 --- a/drivers/staging/brcm80211/brcmsmac/aiutils.c +++ b/drivers/staging/brcm80211/brcmsmac/aiutils.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/include/hnddma.h b/drivers/staging/brcm80211/brcmsmac/bcmdma.h similarity index 100% rename from drivers/staging/brcm80211/include/hnddma.h rename to drivers/staging/brcm80211/brcmsmac/bcmdma.h diff --git a/drivers/staging/brcm80211/brcmsmac/bcmotp.c b/drivers/staging/brcm80211/brcmsmac/bcmotp.c index d09628b5a88e..f0256417d248 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmotp.c +++ b/drivers/staging/brcm80211/brcmsmac/bcmotp.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c index bbfc64204363..9de10fe961be 100644 --- a/drivers/staging/brcm80211/brcmsmac/bcmsrom.c +++ b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/brcmsmac/hnddma.c b/drivers/staging/brcm80211/brcmsmac/dma.c similarity index 99% rename from drivers/staging/brcm80211/brcmsmac/hnddma.c rename to drivers/staging/brcm80211/brcmsmac/dma.c index f607315f8143..6fde51fabf78 100644 --- a/drivers/staging/brcm80211/brcmsmac/hnddma.c +++ b/drivers/staging/brcm80211/brcmsmac/dma.c @@ -20,12 +20,12 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #if defined(__mips__) #include diff --git a/drivers/staging/brcm80211/brcmsmac/nicpci.c b/drivers/staging/brcm80211/brcmsmac/nicpci.c index 18b844a8d2fb..51d56b6b63d5 100644 --- a/drivers/staging/brcm80211/brcmsmac/nicpci.c +++ b/drivers/staging/brcm80211/brcmsmac/nicpci.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/brcmsmac/nvram.c b/drivers/staging/brcm80211/brcmsmac/nvram.c index 085ec0b9224f..65fee2f658ab 100644 --- a/drivers/staging/brcm80211/brcmsmac/nvram.c +++ b/drivers/staging/brcm80211/brcmsmac/nvram.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #define NVR_MSG(x) diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c index 07a5bcb09159..22ba415c047a 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c index b8864c5b7a19..b5ec9ae4a334 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "wlc_phy_radio.h" #include "wlc_phy_int.h" diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c index 71275094e810..123bd6ae47d7 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c index 81c59b05482a..e9d8661babd7 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c index 742df997a3b1..e4a15c4db6b4 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 590d65bbbbea..f58272a73968 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "phy/wlc_phy_int.h" #include "d11.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c index 3b04e02dae03..8a4875da57ed 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "d11.h" #include "wlc_types.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index c83896b04a2a..53ca0ffac477 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include #include "wlc_types.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c index efdc62a8fe58..d26a520e9622 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "d11.h" #include "wlc_rate.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index f98f0fdf35f3..492fb3e05c9d 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include "wlc_types.h" #include "wlc_pmu.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c index 9e293395e5f1..0b980acdf330 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "wlc_types.h" #include "d11.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c index 54b5b7920bbe..c63920cc0b66 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include "wlc_pmu.h" #include "d11.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c index c33b61bd95a3..3a8070641674 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include #include "wlc_types.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c index 6c9574afccfd..4b84cc1c7239 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "wlc_types.h" #include "d11.h" diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c index ca1b8aa0d182..cd051d9fc13c 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "wlc_types.h" #include "d11.h" diff --git a/drivers/staging/brcm80211/include/hndsoc.h b/drivers/staging/brcm80211/include/bcmsoc.h similarity index 100% rename from drivers/staging/brcm80211/include/hndsoc.h rename to drivers/staging/brcm80211/include/bcmsoc.h diff --git a/drivers/staging/brcm80211/include/sbhnddma.h b/drivers/staging/brcm80211/include/sbdma.h similarity index 100% rename from drivers/staging/brcm80211/include/sbhnddma.h rename to drivers/staging/brcm80211/include/sbdma.h -- 2.39.5