Commit b6a2d7eb authored by Paul Mundt's avatar Paul Mundt Committed by Tony Lindgren

[PATCH] ARM: OMAP: STI netlink sem2mutex conversion

Simple update of the STI netlink interface for the mutex API.
Signed-off-by: default avatarPaul Mundt <paul.mundt@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 49e2bab0
/* /*
* OMAP STI/XTI communications interface via netlink socket. * 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 <paul.mundt@nokia.com> * Written by: Paul Mundt <paul.mundt@nokia.com>
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/mutex.h>
#include <net/sock.h> #include <net/sock.h>
#include <asm/arch/sti.h> #include <asm/arch/sti.h>
static struct sock *sti_sock; static struct sock *sti_sock;
static DECLARE_MUTEX(sti_netlink_sem); static DEFINE_MUTEX(sti_netlink_mutex);
enum { enum {
STI_READ, STI_READ,
...@@ -126,7 +127,7 @@ static void sti_netlink_receive(struct sock *sk, int len) ...@@ -126,7 +127,7 @@ static void sti_netlink_receive(struct sock *sk, int len)
{ {
struct sk_buff *skb; struct sk_buff *skb;
if (down_trylock(&sti_netlink_sem)) if (!mutex_trylock(&sti_netlink_mutex))
return; return;
while ((skb = skb_dequeue(&sk->sk_receive_queue))) while ((skb = skb_dequeue(&sk->sk_receive_queue)))
...@@ -135,7 +136,7 @@ static void sti_netlink_receive(struct sock *sk, int len) ...@@ -135,7 +136,7 @@ static void sti_netlink_receive(struct sock *sk, int len)
else else
kfree_skb(skb); kfree_skb(skb);
up(&sti_netlink_sem); mutex_unlock(&sti_netlink_mutex);
} }
static int __init sti_netlink_init(void) static int __init sti_netlink_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment