From penberg@cs.helsinki.fi Mon Oct 27 11:26:04 2008 From: Pekka J Enberg Date: Wed, 22 Oct 2008 19:05:54 +0300 (EEST) Subject: Staging: w35und: make wb35_probe() and wb35_disconnect() funtions static To: Greg Kroah-Hartman Cc: Pavel Machek , linux-kernel@vger.kernel.org Message-ID: From: Pekka Enberg The wb35_probe() and wb35_disconnect() functions are only used in wbusb.c so make them static and remove them from a header file. Signed-off-by: Pekka Enberg Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/linux/wbusb.c | 29 ++--------------------------- drivers/staging/winbond/linux/wbusb_f.h | 4 ---- 2 files changed, 2 insertions(+), 31 deletions(-) --- a/drivers/staging/winbond/linux/wbusb.c +++ b/drivers/staging/winbond/linux/wbusb.c @@ -185,9 +185,7 @@ static const struct ieee80211_ops wbsoft struct wbsoft_priv { }; - -// Usb kernel subsystem will call this function when a new device is plugged into. -int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table) +static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id_table) { PADAPTER Adapter; PWBLINUX pWbLinux; @@ -334,30 +332,7 @@ WbUsb_destroy(phw_data_t pHwData) { } -int wb35_open(struct net_device *netdev) -{ - /* netdev_priv() or netdev->ml_priv should reference to the address of - * private data(PADAPTER). It depends on whether private data memory is - * allocated when alloc_netdev(). - */ - PADAPTER Adapter = (PADAPTER)netdev_priv(netdev); - phw_data_t pHwData = &Adapter->sHwData; - - netif_start_queue(netdev); - - //TODO : put here temporarily - hal_set_accept_broadcast(pHwData, 1); // open accept broadcast - - return 0; -} - -int wb35_close(struct net_device *netdev) -{ - netif_stop_queue(netdev); - return 0; -} - -void wb35_disconnect(struct usb_interface *intf) +static void wb35_disconnect(struct usb_interface *intf) { PWBLINUX pWbLinux; PADAPTER Adapter = usb_get_intfdata(intf); --- a/drivers/staging/winbond/linux/wbusb_f.h +++ b/drivers/staging/winbond/linux/wbusb_f.h @@ -18,10 +18,6 @@ void WbUsb_destroy(phw_data_t pHwData); unsigned char WbWLanInitialize(PADAPTER Adapter); #define WbUsb_Stop( _A ) -int wb35_probe(struct usb_interface *intf,const struct usb_device_id *id_table); -void wb35_disconnect(struct usb_interface *intf); - - #define wb_usb_submit_urb(_A) usb_submit_urb(_A, GFP_ATOMIC) #define wb_usb_alloc_urb(_A) usb_alloc_urb(_A, GFP_ATOMIC)