The original code created some wrappers to handle the differences between Linux and Windows. In a Linux-only version, these can be removed. Larry Finger (6): staging: r8188eu: Remove wrappers for kalloc() and kzalloc() staging: r8188eu: Remove wrapper around vfree staging: r8188eu: Remove wrappers for atomic operations staging: r8188eu: Remove 4 empty routines from os_sep/service.c staging: r8188eu: Remove all calls to _rtw_spinlock_free() staging: r8188eu: Remove more empty routines drivers/staging/r8188eu/core/rtw_ap.c | 8 +- drivers/staging/r8188eu/core/rtw_br_ext.c | 2 +- drivers/staging/r8188eu/core/rtw_br_ext.c.rej | 11 ++ drivers/staging/r8188eu/core/rtw_cmd.c | 16 +-- drivers/staging/r8188eu/core/rtw_efuse.c | 4 +- drivers/staging/r8188eu/core/rtw_efuse.c.rej | 20 ++++ drivers/staging/r8188eu/core/rtw_mlme.c | 15 +-- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 44 +++---- .../staging/r8188eu/core/rtw_mlme_ext.c.rej | 107 ++++++++++++++++++ drivers/staging/r8188eu/core/rtw_mp.c | 5 +- drivers/staging/r8188eu/core/rtw_p2p.c | 8 +- drivers/staging/r8188eu/core/rtw_p2p.c.rej | 18 +++ drivers/staging/r8188eu/core/rtw_recv.c | 16 +-- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 48 +------- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/core/rtw_xmit.c | 26 +---- drivers/staging/r8188eu/hal/odm_interface.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 2 +- .../staging/r8188eu/hal/rtl8188e_cmd.c.rej | 11 ++ .../staging/r8188eu/hal/rtl8188e_hal_init.c | 10 +- .../r8188eu/hal/rtl8188e_hal_init.c.rej | 34 ++++++ drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 3 +- .../staging/r8188eu/hal/rtl8188eu_recv.c.rej | 12 ++ drivers/staging/r8188eu/hal/usb_halinit.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c.rej | 11 ++ drivers/staging/r8188eu/include/drv_types.h | 2 +- .../staging/r8188eu/include/odm_precomp.h.rej | 19 ++++ .../staging/r8188eu/include/osdep_service.h | 28 ----- drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- .../staging/r8188eu/include/rtw_mlme_ext.h | 2 +- drivers/staging/r8188eu/include/usb_ops.h | 4 +- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 70 ++++++------ drivers/staging/r8188eu/os_dep/mlme_linux.c | 3 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 - .../staging/r8188eu/os_dep/osdep_service.c | 105 +---------------- drivers/staging/r8188eu/os_dep/rtw_android.c | 2 - drivers/staging/r8188eu/os_dep/usb_intf.c | 10 +- drivers/staging/r8188eu/os_dep/xmit_linux.c | 2 +- .../staging/r8188eu/os_dep/xmit_linux.c.rej | 11 ++ 39 files changed, 366 insertions(+), 333 deletions(-) create mode 100644 drivers/staging/r8188eu/core/rtw_br_ext.c.rej create mode 100644 drivers/staging/r8188eu/core/rtw_efuse.c.rej create mode 100644 drivers/staging/r8188eu/core/rtw_mlme_ext.c.rej create mode 100644 drivers/staging/r8188eu/core/rtw_p2p.c.rej create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_cmd.c.rej create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_hal_init.c.rej create mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c.rej create mode 100644 drivers/staging/r8188eu/hal/usb_halinit.c.rej create mode 100644 drivers/staging/r8188eu/include/odm_precomp.h.rej create mode 100644 drivers/staging/r8188eu/os_dep/xmit_linux.c.rej -- 2.32.0