From b6a2d7eb0a6dfb35de95e2cd29d28d93fdfbd0f7 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 4 May 2006 07:00:52 -0700 Subject: [PATCH] [PATCH] ARM: OMAP: STI netlink sem2mutex conversion Simple update of the STI netlink interface for the mutex API. Signed-off-by: Paul Mundt Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/sti/sti-netlink.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/plat-omap/sti/sti-netlink.c b/arch/arm/plat-omap/sti/sti-netlink.c index 45b8085b94b..5593aee567d 100644 --- a/arch/arm/plat-omap/sti/sti-netlink.c +++ b/arch/arm/plat-omap/sti/sti-netlink.c @@ -1,7 +1,7 @@ /* * OMAP STI/XTI communications interface via netlink socket. * - * Copyright (C) 2004, 2005 Nokia Corporation + * Copyright (C) 2004, 2005, 2006 Nokia Corporation * Written by: Paul Mundt * * This file is subject to the terms and conditions of the GNU General Public @@ -13,11 +13,12 @@ #include #include #include +#include #include #include static struct sock *sti_sock; -static DECLARE_MUTEX(sti_netlink_sem); +static DEFINE_MUTEX(sti_netlink_mutex); enum { STI_READ, @@ -126,7 +127,7 @@ static void sti_netlink_receive(struct sock *sk, int len) { struct sk_buff *skb; - if (down_trylock(&sti_netlink_sem)) + if (!mutex_trylock(&sti_netlink_mutex)) return; while ((skb = skb_dequeue(&sk->sk_receive_queue))) @@ -135,7 +136,7 @@ static void sti_netlink_receive(struct sock *sk, int len) else kfree_skb(skb); - up(&sti_netlink_sem); + mutex_unlock(&sti_netlink_mutex); } static int __init sti_netlink_init(void) -- 2.41.1