staging: r8188eu: remove recv_osdep.h header
cover staging: r8188eu: remove recv_osdep.h header
This series removes the header recv_osdep.h.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (3):
staging: r8188eu: make _netdev_open() static
staging: r8188eu: remove unused prototypes from recv_osdep.h
staging: r8188eu: remove recv_osdep.h
drivers/staging/r8188eu/core/rtw_br_ext.c | 1 - drivers/staging/r8188eu/core/rtw_cmd.c | 1 - drivers/staging/r8188eu/core/rtw_mlme.c | 1 - drivers/staging/r8188eu/core/rtw_mlme_ext.c | 1 - drivers/staging/r8188eu/core/rtw_recv.c | 1 - drivers/staging/r8188eu/core/rtw_sta_mgt.c | 1 - drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 1 - drivers/staging/r8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/r8188eu/include/osdep_intf.h | 3 +++ drivers/staging/r8188eu/include/recv_osdep.h | 23 ------------------- drivers/staging/r8188eu/include/rtw_recv.h | 3 +++ drivers/staging/r8188eu/os_dep/os_intfs.c | 3 +-- .../staging/r8188eu/os_dep/osdep_service.c | 1 - drivers/staging/r8188eu/os_dep/usb_intf.c | 1 - 14 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/recv_osdep.h
Signature · 1 line
2.37.3
PATCH 1/3 staging: r8188eu: make _netdev_open() static
The function _netdev_open() is only used in os_intfs.c. Make it static.
--- drivers/staging/r8188eu/include/recv_osdep.h | 1 - drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/staging/r8188eu/include/recv_osdep.h +0 -1
@@ -16,7 +16,6 @@ void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *retpkt);int rtw_init_recv_priv (struct recv_priv *precvpriv,struct adapter *padapter);void rtw_free_recv_priv (struct recv_priv *precvpriv); -int _netdev_open (struct net_device *pnetdev);int netdev_open (struct net_device *pnetdev);int netdev_close (struct net_device *pnetdev);
drivers/staging/r8188eu/os_dep/os_intfs.c +1 -1
@@ -617,7 +617,7 @@ void netdev_br_init(struct net_device *netdev)rcu_read_unlock (); } -int _netdev_open (struct net_device *pnetdev) +static int _netdev_open (struct net_device *pnetdev) {uint status;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev);
Signature · 1 line
2.37.3
PATCH 2/3 staging: r8188eu: remove unused prototypes from recv_osdep.h
In reply to Michael StraubeThe function prototypes rtw_recv_returnpacket(), rtw_init_recv_priv() and rtw_free_recv_priv() are not used. Remove them.
--- drivers/staging/r8188eu/include/recv_osdep.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/r8188eu/include/recv_osdep.h +0 -4
@@ -11,10 +11,6 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);void _rtw_free_recv_priv (struct recv_priv *precvpriv);s32 rtw_recv_entry (struct recv_frame *precv_frame); -void rtw_recv_returnpacket (struct net_device *cnxt,struct sk_buff *retpkt); - -int rtw_init_recv_priv (struct recv_priv *precvpriv,struct adapter *padapter); -void rtw_free_recv_priv (struct recv_priv *precvpriv);int netdev_open (struct net_device *pnetdev);int netdev_close (struct net_device *pnetdev);
Signature · 1 line
2.37.3
PATCH 3/3 staging: r8188eu: remove recv_osdep.h
In reply to Michael StraubeThe functions _rtw_init_recv_priv(), _rtw_free_recv_priv() and rtw_recv_entry() are defined in rtw_recv.c. Move their prototypes from recv_osdep.h to rtw_recv.h.
Move the last two remaining prototypes netdev_open() and netdev_close() from recv_osdep.h to osdep_intf.h. That is a more appropriate place and we can remove recv_osdep.h.
--- drivers/staging/r8188eu/core/rtw_br_ext.c | 1 - drivers/staging/r8188eu/core/rtw_cmd.c | 1 - drivers/staging/r8188eu/core/rtw_mlme.c | 1 - drivers/staging/r8188eu/core/rtw_mlme_ext.c | 1 - drivers/staging/r8188eu/core/rtw_recv.c | 1 - drivers/staging/r8188eu/core/rtw_sta_mgt.c | 1 - drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 1 - drivers/staging/r8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/r8188eu/include/osdep_intf.h | 3 +++ drivers/staging/r8188eu/include/recv_osdep.h | 18 ------------------ drivers/staging/r8188eu/include/rtw_recv.h | 3 +++ drivers/staging/r8188eu/os_dep/os_intfs.c | 1 - drivers/staging/r8188eu/os_dep/osdep_service.c | 1 - drivers/staging/r8188eu/os_dep/usb_intf.c | 1 - 14 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/recv_osdep.h
drivers/staging/r8188eu/core/rtw_br_ext.c +0 -1
@@ -12,7 +12,6 @@#include "../include/drv_types.h" #include "../include/rtw_br_ext.h" #include "../include/usb_osintf.h" -#include "../include/recv_osdep.h" #ifndef csum_ipv6_magic#include "../include/net/ip6_checksum.h"
drivers/staging/r8188eu/core/rtw_cmd.c +0 -1
@@ -5,7 +5,6 @@#include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" #include "../include/rtw_br_ext.h" #include "../include/rtw_mlme_ext.h" #include "../include/rtl8188e_dm.h"
drivers/staging/r8188eu/core/rtw_mlme.c +0 -1
@@ -5,7 +5,6 @@#include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" #include "../include/hal_intf.h" #include "../include/sta_info.h" #include "../include/wifi.h"
drivers/staging/r8188eu/core/rtw_mlme_ext.c +0 -1
@@ -9,7 +9,6 @@#include "../include/wifi.h" #include "../include/rtw_mlme_ext.h" #include "../include/wlan_bssdef.h" -#include "../include/recv_osdep.h" #include "../include/rtl8188e_xmit.h" #include "../include/rtl8188e_dm.h"
drivers/staging/r8188eu/core/rtw_recv.c +0 -1
@@ -6,7 +6,6 @@#include <linux/ieee80211.h> #include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" #include "../include/usb_ops.h" #include "../include/wifi.h" #include "../include/rtl8188e_recv.h"
drivers/staging/r8188eu/core/rtw_sta_mgt.c +0 -1
@@ -5,7 +5,6 @@#include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" #include "../include/sta_info.h" static void _rtw_init_stainfo (struct sta_info *psta)
drivers/staging/r8188eu/hal/rtl8188e_cmd.c +0 -1
@@ -5,7 +5,6 @@#include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" #include "../include/rtw_ioctl_set.h" #include "../include/rtl8188e_hal.h"
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -1
@@ -5,7 +5,6 @@#include "../include/drv_types.h" #include "../include/osdep_intf.h" #include "../include/usb_ops.h" -#include "../include/recv_osdep.h" #include "../include/rtl8188e_hal.h" static int usb_read (struct intf_hdl *intf,u16 value,void *data,u8 size)
drivers/staging/r8188eu/include/osdep_intf.h +3 -0
@@ -39,6 +39,9 @@ The protection mechanism is through the pending queue.u8 bio_timer_cancel; }; +int netdev_open (struct net_device *pnetdev); +int netdev_close (struct net_device *pnetdev); +u8 rtw_init_drv_sw (struct adapter *padapter);u8 rtw_free_drv_sw (struct adapter *padapter);u8 rtw_reset_drv_sw (struct adapter *padapter);
drivers/staging/r8188eu/include/recv_osdep.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef __RECV_OSDEP_H_ -#define __RECV_OSDEP_H_ - -#include "osdep_service.h" -#include "drv_types.h" - -int _rtw_init_recv_priv (struct recv_priv *precvpriv,struct adapter *padapter); -void _rtw_free_recv_priv (struct recv_priv *precvpriv); - -s32 rtw_recv_entry (struct recv_frame *precv_frame); - -int netdev_open (struct net_device *pnetdev); -int netdev_close (struct net_device *pnetdev); - -#endif /* */
drivers/staging/r8188eu/include/rtw_recv.h +3 -0
@@ -243,6 +243,9 @@ struct recv_frame {struct recv_reorder_ctrl *preorder_ctrl; }; +int _rtw_init_recv_priv (struct recv_priv *precvpriv,struct adapter *padapter); +void _rtw_free_recv_priv (struct recv_priv *precvpriv); +s32 rtw_recv_entry (struct recv_frame *precv_frame);struct recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue);struct recv_frame *rtw_alloc_recvframe (struct __queue *pfree_recv_queue); int rtw_free_recvframe(struct recv_frame *precvframe,
drivers/staging/r8188eu/os_dep/os_intfs.c +0 -1
@@ -5,7 +5,6 @@#include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" #include "../include/hal_intf.h" #include "../include/rtw_ioctl.h" #include "../include/usb_osintf.h"
drivers/staging/r8188eu/os_dep/osdep_service.c +0 -1
@@ -5,7 +5,6 @@#include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" #include "../include/rtw_ioctl_set.h" /*
drivers/staging/r8188eu/os_dep/usb_intf.c +0 -1
@@ -4,7 +4,6 @@#include <linux/usb.h> #include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" #include "../include/hal_intf.h" #include "../include/osdep_intf.h" #include "../include/usb_ops.h"
Signature · 1 line
2.37.3
Quoted 24 lines · Michael Straube
This series removes the header
recv_osdep.h.Tested on
x86_64with Inter-Tech DMG-02.Michael Straube (3):
staging: r8188eu: make_netdev_open()static
staging: r8188eu: remove unused prototypes fromrecv_osdep.h
staging: r8188eu: removerecv_osdep.hdrivers/staging/r8188eu/core/rtw_br_ext.c | 1 - drivers/staging/r8188eu/core/rtw_cmd.c | 1 - drivers/staging/r8188eu/core/rtw_mlme.c | 1 - drivers/staging/r8188eu/core/rtw_mlme_ext.c | 1 - drivers/staging/r8188eu/core/rtw_recv.c | 1 - drivers/staging/r8188eu/core/rtw_sta_mgt.c | 1 - drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 1 - drivers/staging/r8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/r8188eu/include/osdep_intf.h | 3 +++ drivers/staging/r8188eu/include/recv_osdep.h | 23 ------------------- drivers/staging/r8188eu/include/rtw_recv.h | 3 +++ drivers/staging/r8188eu/os_dep/os_intfs.c | 3 +-- .../staging/r8188eu/os_dep/osdep_service.c | 1 - drivers/staging/r8188eu/os_dep/usb_intf.c | 1 - 14 files changed, 7 insertions(+), 35 deletions(-)
Quoted 2 lines
delete mode 100644
drivers/staging/r8188eu/include/recv_osdep.h