AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Staging: w35und: remove ->shutdown from struct wbsoft_priv

Browse Source 
It's not actually used for anything, so remove it.

Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pekka Enberg 2008-10-30 18:12:07 +02:00 committed by Greg Kroah-Hartman
parent 72e202d00e
commit 54369cc69c
6 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/winbond/Makefile
View File

@ -9,7 +9,6 @@ w35und-objs := \
wb35rx.o \
wb35tx.o \
wbhal.o \
wblinux.o \
wbusb.o \

1
drivers/staging/winbond/core.h
View File

@ -24,7 +24,6 @@ struct wbsoft_priv {
MDS Mds;
spinlock_t SpinLock;
u32 shutdown;
atomic_t ThreadCount;

1
drivers/staging/winbond/wbhal.c
View File

@ -850,7 +850,6 @@ void hal_surprise_remove(struct wbsoft_priv *adapter)
#ifdef _PE_STATE_DUMP_
WBDEBUG(("Calling hal_surprise_remove\n"));
#endif
WBLINUX_stop( adapter );
}
}

31
drivers/staging/winbond/wblinux.c
View File

@ -1,31 +0,0 @@
//============================================================================
// Copyright (c) 1996-2005 Winbond Electronic Corporation
//
// Module Name:
// wblinux.c
//
// Abstract:
// Linux releated routines
//
//============================================================================
#include <linux/netdevice.h>
#include "mds_f.h"
#include "mto_f.h"
#include "os_common.h"
#include "wbhal_f.h"
#include "wblinux_f.h"
void
WBLINUX_stop( struct wbsoft_priv * adapter )
{
if (atomic_inc_return(&adapter->ThreadCount) == 1) {
// Shutdown module immediately
adapter->shutdown = 1;
#ifdef _PE_STATE_DUMP_
WBDEBUG(( "[w35und] SKB_RELEASE OK\n" ));
#endif
}
atomic_dec(&adapter->ThreadCount);
}

2
drivers/staging/winbond/wblinux_f.h
View File

@ -10,9 +10,7 @@
// wblinux_f.h
//
int wb35_start_xmit(struct sk_buff *skb, struct net_device *netdev );
void WBLINUX_stop( struct wbsoft_priv *adapter );
void wb35_set_multicast( struct net_device *netdev );
struct net_device_stats * wb35_netdev_stats( struct net_device *netdev );
void WBLINUX_stop( struct wbsoft_priv *adapter );
#endif

6
drivers/staging/winbond/wbusb.c
View File

@ -302,8 +302,7 @@ static unsigned char wb35_hw_init(struct ieee80211_hw *hw)
case 4:
case 3: Mds_Destroy( priv );
case 2:
case 1: WBLINUX_stop(priv);
hal_halt( pHwData, NULL );
case 1: hal_halt( pHwData, NULL );
case 0: break;
}
@ -402,9 +401,6 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter)
#endif
msleep(100);// Waiting Irp completed
// Destroy the NDIS module
WBLINUX_stop(adapter);
// Halt the HAL
hal_halt(&adapter->sHwData, NULL);
}