Replace semaphore netlink_mutex with mutex. Semaphores are
going away in the future.

Signed-off-by: Binoy Jayan <binoy.ja...@linaro.org>
Reviewed-by: Arnd Bergmann <a...@arndb.de>
---
 drivers/staging/gdm724x/netlink_k.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/staging/gdm724x/netlink_k.c 
b/drivers/staging/gdm724x/netlink_k.c
index a0232e8..abe2425 100644
--- a/drivers/staging/gdm724x/netlink_k.c
+++ b/drivers/staging/gdm724x/netlink_k.c
@@ -14,6 +14,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/export.h>
+#include <linux/mutex.h>
 #include <linux/etherdevice.h>
 #include <linux/netlink.h>
 #include <asm/byteorder.h>
@@ -21,13 +22,7 @@
 
 #include "netlink_k.h"
 
-#if defined(DEFINE_MUTEX)
 static DEFINE_MUTEX(netlink_mutex);
-#else
-static struct semaphore netlink_mutex;
-#define mutex_lock(x)          down(x)
-#define mutex_unlock(x)                up(x)
-#endif
 
 #define ND_MAX_GROUP           30
 #define ND_IFINDEX_LEN         sizeof(int)
@@ -96,10 +91,6 @@ struct sock *netlink_init(int unit,
                .input  = netlink_rcv,
        };
 
-#if !defined(DEFINE_MUTEX)
-       init_MUTEX(&netlink_mutex);
-#endif
-
        sock = netlink_kernel_create(&init_net, unit, &cfg);
 
        if (sock)
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Reply via email to