From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424207AbcFMO37 (ORCPT ); Mon, 13 Jun 2016 10:29:59 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:34360 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422860AbcFMO36 (ORCPT ); Mon, 13 Jun 2016 10:29:58 -0400 From: Binoy Jayan To: Greg Kroah-Hartman Cc: Arnd Bergmann , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH] staging: gdm724x: Replace semaphore netlink with mutex Date: Mon, 13 Jun 2016 19:59:20 +0530 Message-Id: <1465828160-17141-1-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace semaphore netlink_mutex with mutex. Semaphores are going away in the future. Signed-off-by: Binoy Jayan --- drivers/staging/gdm724x/netlink_k.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/gdm724x/netlink_k.c b/drivers/staging/gdm724x/netlink_k.c index a0232e8..57db83d 100644 --- a/drivers/staging/gdm724x/netlink_k.c +++ b/drivers/staging/gdm724x/netlink_k.c @@ -21,13 +21,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 +static struct mutex netlink_mutex; #define ND_MAX_GROUP 30 #define ND_IFINDEX_LEN sizeof(int) @@ -96,9 +90,7 @@ struct sock *netlink_init(int unit, .input = netlink_rcv, }; -#if !defined(DEFINE_MUTEX) - init_MUTEX(&netlink_mutex); -#endif + mutex_init(&netlink_mutex); sock = netlink_kernel_create(&init_net, unit, &cfg); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project