Skip to content

Commit

Permalink
Staging: w35und: make wb35_probe() and wb35_disconnect() funtions static
Browse files Browse the repository at this point in the history
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 <penberg@cs.helsinki.fi>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent a337957 commit 302bae8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 31 deletions.
29 changes: 2 additions & 27 deletions drivers/staging/winbond/linux/wbusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/winbond/linux/wbusb_f.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 302bae8

Please sign in to comment.