From b25a37b910dd9b0eda1cc3a55be2abf38dae21da Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 Sep 2015 19:38:42 -0700 Subject: [PATCH] staging: wilc1000: remove wrapper around spin_lock_init() It's only called once, so just call the real function. Also remove the empty "deinit" function that didn't do anything. Cc: Johnny Kim Cc: Rachel Kim Cc: Dean Lee Cc: Chris Park Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/linux_wlan.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 14ea61665a85..dace77e046b2 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -601,18 +601,6 @@ static void linux_wlan_deinit_mutex(void *plock) mutex_destroy((struct mutex *)plock); } -/*Added by Amr - BugID_4720*/ -static void linux_wlan_init_spin_lock(char *lockName, void *plock, int count) -{ - spin_lock_init((spinlock_t *)plock); - PRINT_D(SPIN_DEBUG, "Initializing mutex [%s][%p]\n", lockName, plock); - -} - -static void linux_wlan_deinit_spin_lock(void *plock) -{ - -} static void linux_wlan_spin_lock(void *vp, unsigned long *flags) { unsigned long lflags; @@ -1335,7 +1323,7 @@ int wlan_init_locks(linux_wlan_t *p_nic) linux_wlan_init_mutex("txq_lock/txq_cs", &g_linux_wlan->txq_cs, 1); /*Added by Amr - BugID_4720*/ - linux_wlan_init_spin_lock("txq_spin_lock/txq_cs", &g_linux_wlan->txq_spinlock, 1); + spin_lock_init(&g_linux_wlan->txq_spinlock); /*Added by Amr - BugID_4720*/ linux_wlan_init_lock("txq_add_to_head_lock/txq_cs", &g_linux_wlan->txq_add_to_head_cs, 1); @@ -1369,10 +1357,6 @@ static int wlan_deinit_locks(linux_wlan_t *nic) if (&g_linux_wlan->txq_cs != NULL) linux_wlan_deinit_mutex(&g_linux_wlan->txq_cs); - /*Added by Amr - BugID_4720*/ - if (&g_linux_wlan->txq_spinlock != NULL) - linux_wlan_deinit_spin_lock(&g_linux_wlan->txq_spinlock); - if (&g_linux_wlan->rxq_event != NULL) linux_wlan_deinit_lock(&g_linux_wlan->rxq_event); -- 2.39.5