Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / gdm724x / netlink_k.c

diff --git a/drivers/staging/gdm724x/netlink_k.c b/drivers/staging/gdm724x/netlink_k.c
index a0232e8aec10b96612564259aeebaeee4e248dcd..abe2425058825d743605c87ea330e6118b960cb1 100644 (file)
--- 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)