Staging: w35und: remove ->shutdown from struct wbsoft_priv

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>

diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile
index a93732e6201f1521d118002da149476275014ae5..d337571a972b238b0d25fc0bfa0ad0eb85069c2c 100644 (file)
--- a/drivers/staging/winbond/Makefile
+++ b/drivers/staging/winbond/Makefile
@@ -9,7 +9,6 @@ w35und-objs :=                  \
        wb35rx.o                \
        wb35tx.o                \
        wbhal.o                 \
-       wblinux.o               \
        wbusb.o                 \
 
 

diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index 9c9d5d29e6676be03c27a80f108f2efd6c29163a..fe142a10ea80ea5df00fcbc35736bfc318530bdf 100644 (file)
--- a/drivers/staging/winbond/core.h
+++ b/drivers/staging/winbond/core.h
@@ -24,7 +24,6 @@ struct wbsoft_priv {
        MDS Mds;
 
        spinlock_t SpinLock;
-       u32 shutdown;
 
        atomic_t ThreadCount;
 

diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c
index 026a5a8bc3403e5af885eb5131f6921ee783676a..b23c5055605c37485b1610b740201e7db88750b5 100644 (file)
--- a/drivers/staging/winbond/wbhal.c
+++ b/drivers/staging/winbond/wbhal.c
@@ -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 );
        }
 }
 

diff --git a/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c
deleted file mode 100644 (file)
index 87db0a8..0000000
--- a/drivers/staging/winbond/wblinux.c
+++ /dev/null
@@ -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);
-}

diff --git a/drivers/staging/winbond/wblinux_f.h b/drivers/staging/winbond/wblinux_f.h
index f531a012948085634444fbea87a02669404e7d82..868e877272401cfd5fabdc5b58e5f164212de9d8 100644 (file)
--- a/drivers/staging/winbond/wblinux_f.h
+++ b/drivers/staging/winbond/wblinux_f.h
@@ -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

diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index b981662a96a32e03258b3710f2dfa7d44246947f..cb4dee566f7f071d882a44fb26931bce86555d3a 100644 (file)
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -302,8 +302,7 @@ error:
        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);
 }