From 9ce922fde7fb44a8690aa37d3c7f4f0cf5d921ca Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 30 Oct 2008 13:05:42 +0200 Subject: Staging: w35und: move source files to one directory As we're trying to get rid of the "compatability layer" in the driver, move everything under one directory. Keeping some of the files under drivers/staging/winbond/linux is a major pain in the ass whenever you're cleaning up the driver. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/wb35rx_f.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 drivers/staging/winbond/wb35rx_f.h (limited to 'drivers/staging/winbond/wb35rx_f.h') diff --git a/drivers/staging/winbond/wb35rx_f.h b/drivers/staging/winbond/wb35rx_f.h new file mode 100644 index 00000000000..9fb2e2aacf6 --- /dev/null +++ b/drivers/staging/winbond/wb35rx_f.h @@ -0,0 +1,20 @@ +#ifndef __WINBOND_WB35RX_F_H +#define __WINBOND_WB35RX_F_H + +#include "wbhal_s.h" + +//==================================== +// Interface function declare +//==================================== +void Wb35Rx_reset_descriptor( phw_data_t pHwData ); +unsigned char Wb35Rx_initial( phw_data_t pHwData ); +void Wb35Rx_destroy( phw_data_t pHwData ); +void Wb35Rx_stop( phw_data_t pHwData ); +u16 Wb35Rx_indicate( phw_data_t pHwData ); +void Wb35Rx_adjust( PDESCRIPTOR pRxDes ); +void Wb35Rx_start( phw_data_t pHwData ); + +void Wb35Rx( phw_data_t pHwData ); +void Wb35Rx_Complete(struct urb *urb); + +#endif -- cgit v1.2.3 From 7fff1316b9ecc415fb1d43f438c0668884a24881 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 30 Oct 2008 16:14:39 +0200 Subject: Staging: w35und: remove global struct ieee80211_hw Remove the my_dev global variable from wbusb.c by passing a pointer to struct ieee80211_hw around so that packet_came() gets it. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/wb35rx_f.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/staging/winbond/wb35rx_f.h') diff --git a/drivers/staging/winbond/wb35rx_f.h b/drivers/staging/winbond/wb35rx_f.h index 9fb2e2aacf6..5585b55cb89 100644 --- a/drivers/staging/winbond/wb35rx_f.h +++ b/drivers/staging/winbond/wb35rx_f.h @@ -1,6 +1,7 @@ #ifndef __WINBOND_WB35RX_F_H #define __WINBOND_WB35RX_F_H +#include #include "wbhal_s.h" //==================================== @@ -10,11 +11,11 @@ void Wb35Rx_reset_descriptor( phw_data_t pHwData ); unsigned char Wb35Rx_initial( phw_data_t pHwData ); void Wb35Rx_destroy( phw_data_t pHwData ); void Wb35Rx_stop( phw_data_t pHwData ); -u16 Wb35Rx_indicate( phw_data_t pHwData ); +u16 Wb35Rx_indicate(struct ieee80211_hw *hw); void Wb35Rx_adjust( PDESCRIPTOR pRxDes ); -void Wb35Rx_start( phw_data_t pHwData ); +void Wb35Rx_start(struct ieee80211_hw *hw); -void Wb35Rx( phw_data_t pHwData ); +void Wb35Rx(struct ieee80211_hw *hw); void Wb35Rx_Complete(struct urb *urb); #endif -- cgit v1.2.3 From c139a814ab1735a8a1fa1b63cad71bd4f8dd8935 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 30 Oct 2008 19:04:53 +0200 Subject: Staging: w35und: make functions local to wb35rx.c static While there are no functional changes, the diff is quite large because we need to shuffle code around to avoid forward declarations. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/wb35rx_f.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/staging/winbond/wb35rx_f.h') diff --git a/drivers/staging/winbond/wb35rx_f.h b/drivers/staging/winbond/wb35rx_f.h index 5585b55cb89..d993041e0cd 100644 --- a/drivers/staging/winbond/wb35rx_f.h +++ b/drivers/staging/winbond/wb35rx_f.h @@ -7,15 +7,9 @@ //==================================== // Interface function declare //==================================== -void Wb35Rx_reset_descriptor( phw_data_t pHwData ); unsigned char Wb35Rx_initial( phw_data_t pHwData ); void Wb35Rx_destroy( phw_data_t pHwData ); void Wb35Rx_stop( phw_data_t pHwData ); -u16 Wb35Rx_indicate(struct ieee80211_hw *hw); -void Wb35Rx_adjust( PDESCRIPTOR pRxDes ); void Wb35Rx_start(struct ieee80211_hw *hw); -void Wb35Rx(struct ieee80211_hw *hw); -void Wb35Rx_Complete(struct urb *urb); - #endif -- cgit v1.2.3