From e1abe0410fa89e1248439b716fa40ce6fdaf69b1 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Wed, 22 Oct 2008 19:05:54 +0300 Subject: [PATCH] --- yaml --- r: 126544 b: refs/heads/master c: 302bae8548bde90bd2e5b4f2171974c1ce7ed30f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/winbond/linux/wbusb.c | 29 ++----------------- trunk/drivers/staging/winbond/linux/wbusb_f.h | 4 --- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/[refs] b/[refs] index ad7152d2a3b7..86b7dce42953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3379572474aad4d113985682971955ad87c8a37 +refs/heads/master: 302bae8548bde90bd2e5b4f2171974c1ce7ed30f diff --git a/trunk/drivers/staging/winbond/linux/wbusb.c b/trunk/drivers/staging/winbond/linux/wbusb.c index 39ca9b9878f8..c1e2562ac65b 100644 --- a/trunk/drivers/staging/winbond/linux/wbusb.c +++ b/trunk/drivers/staging/winbond/linux/wbusb.c @@ -185,9 +185,7 @@ static const struct ieee80211_ops wbsoft_ops = { 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); diff --git a/trunk/drivers/staging/winbond/linux/wbusb_f.h b/trunk/drivers/staging/winbond/linux/wbusb_f.h index cae29e107e11..9a69008e830c 100644 --- a/trunk/drivers/staging/winbond/linux/wbusb_f.h +++ b/trunk/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)