New attempt for the patch series with comments received. Patch series contain changes reducing use of OSL (OS abstraction) and aim to get rid if it entirely. Also some include files have been made obsolete. Arend van Spriel (19): staging: brcm80211: remove unused module from softmac driver staging: brcm80211: cleanup function prototypes in header files staging: brcm80211: remove nested include statements staging: brcm80211: remove typedefs that were flagged by checkpatch staging: brcm80211: remove typedef for struct wl_timer staging: brcm80211: remove include file proto/802.1d.h staging: brcm80211: remove include file sbhndpio.h staging: brcm80211: remove include file d11ucode_ext.h staging: brcm80211: remove checks for ANTSEL related compiler definitions staging: brcm80211: remove osl handle from pkttotlen function staging: brcm80211: remove struct osl_info parameter from wlc_alloc staging: brcm80211: remove NULL pointer checks before calling kfree staging: brcm80211: remove usage of struct osl_info to access device staging: brcm80211: remove usage of struct osl_info for register access staging: brcm80211: remove usage of struct osl_info from util sources staging: brcm80211: change prototype for wlc_antsel_attach staging: brcm80211: changed module wlc_mac80211 to wlc_main staging: brcm80211: adapt driver sources to renamed source module staging: brcm80211: replace simple_strtoul with strict_strtoul Brett Rudley (3): staging: brcm80211: Remove abstractions for pci_(un)map_single staging: brcm80211: Remove abstraction of pci_(alloc/free)_consistent staging: brcm80211: relocate skb_get/free routines drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 25 +- drivers/staging/brcm80211/brcmsmac/Makefile | 3 +- drivers/staging/brcm80211/brcmsmac/d11.h | 31 + drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h | 35 -- .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 171 +++--- .../staging/brcm80211/brcmsmac/phy/wlc_phy_int.h | 2 +- .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 45 +- drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 55 +- .../brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c | 1 - .../staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c | 1 - drivers/staging/brcm80211/brcmsmac/sbhndpio.h | 52 -- drivers/staging/brcm80211/brcmsmac/wl_export.h | 3 - drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 138 ++--- drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 23 +- drivers/staging/brcm80211/brcmsmac/wl_ucode.h | 26 +- .../staging/brcm80211/brcmsmac/wl_ucode_loader.c | 38 +- drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 196 +++---- drivers/staging/brcm80211/brcmsmac/wlc_alloc.h | 11 +- drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 62 +- drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h | 6 +- drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 54 +- drivers/staging/brcm80211/brcmsmac/wlc_antsel.h | 9 +- drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 483 ++++++++-------- drivers/staging/brcm80211/brcmsmac/wlc_bmac.h | 42 +-- drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | 4 - drivers/staging/brcm80211/brcmsmac/wlc_cfg.h | 6 - drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 82 ++- drivers/staging/brcm80211/brcmsmac/wlc_channel.h | 31 +- drivers/staging/brcm80211/brcmsmac/wlc_event.c | 203 ------ drivers/staging/brcm80211/brcmsmac/wlc_event.h | 50 -- .../brcmsmac/{wlc_mac80211.c => wlc_main.c} | 305 ++++------ .../brcmsmac/{wlc_mac80211.h => wlc_main.h} | 81 ++-- drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 42 +- drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 29 - drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 20 +- drivers/staging/brcm80211/brcmsmac/wlc_scb.h | 2 - drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 38 +- drivers/staging/brcm80211/brcmsmac/wlc_stf.h | 6 +- drivers/staging/brcm80211/include/bcmdefs.h | 14 + drivers/staging/brcm80211/include/bcmsrom.h | 6 +- drivers/staging/brcm80211/include/bcmutils.h | 22 +- drivers/staging/brcm80211/include/hndpmu.h | 47 +- drivers/staging/brcm80211/include/nicpci.h | 10 +- drivers/staging/brcm80211/include/osl.h | 74 +-- drivers/staging/brcm80211/include/proto/802.1d.h | 37 -- drivers/staging/brcm80211/include/siutils.h | 10 +- drivers/staging/brcm80211/util/aiutils.c | 58 +- drivers/staging/brcm80211/util/bcmotp.c | 45 +- drivers/staging/brcm80211/util/bcmsrom.c | 120 ++-- drivers/staging/brcm80211/util/bcmutils.c | 53 ++- drivers/staging/brcm80211/util/hnddma.c | 191 +++--- drivers/staging/brcm80211/util/hndpmu.c | 643 ++++++++++---------- drivers/staging/brcm80211/util/linux_osl.c | 87 --- drivers/staging/brcm80211/util/nicpci.c | 144 +++--- drivers/staging/brcm80211/util/nvram/nvram_ro.c | 5 +- drivers/staging/brcm80211/util/sbutils.c | 12 +- drivers/staging/brcm80211/util/siutils.c | 213 +++---- 57 files changed, 1773 insertions(+), 2429 deletions(-) delete mode 100644 drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h delete mode 100644 drivers/staging/brcm80211/brcmsmac/sbhndpio.h delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_event.c delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_event.h rename drivers/staging/brcm80211/brcmsmac/{wlc_mac80211.c => wlc_main.c} (97%) rename drivers/staging/brcm80211/brcmsmac/{wlc_mac80211.h => wlc_main.h} (96%) delete mode 100644 drivers/staging/brcm80211/include/proto/802.1d.h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel