From: Priit Laes Date: Sat, 1 Sep 2012 09:06:03 +0000 (+0300) Subject: staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.37 X-Git-Tag: next-20120905~19^2~28 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=879a901f7eb6271d82da40cfb3c5bc3b6bb5c3fe;p=karo-tx-linux.git staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.37 Signed-off-by: Priit Laes Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index 01ec08e15b16..6fac0681210d 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -338,21 +338,13 @@ uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id) interfacePriv->connected = UnifiConnectedUnknown; /* -1 unknown, 0 no, 1 yes */ #ifdef USE_DRIVER_LOCK -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) sema_init(&priv->lock, 1); -#else - init_MUTEX(&priv->lock); -#endif #endif /* USE_DRIVER_LOCK */ spin_lock_init(&priv->send_signal_lock); spin_lock_init(&priv->m4_lock); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) sema_init(&priv->ba_mutex, 1); -#else - init_MUTEX(&priv->ba_mutex); -#endif #if (defined(CSR_WIFI_SECURITY_WAPI_ENABLE) && defined(CSR_WIFI_SECURITY_WAPI_SW_ENCRYPTION)) spin_lock_init(&priv->wapi_lock);