lkml.org 
[lkml]   [2006]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 2.6.17-rc5-mm2 04/18] Semaphore to mutex conversion.
From: Arjan van de Ven <arjan@infradead.org>

Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Ben Collins <bcollins@debian.org>
Cc: Jody McIntyre <scjody@modernduck.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Index: linux-2.6.17-rc5-mm2/drivers/ieee1394/hosts.c
===================================================================
--- linux-2.6.17-rc5-mm2.orig/drivers/ieee1394/hosts.c 2006-06-01 20:55:05.000000000 +0200
+++ linux-2.6.17-rc5-mm2/drivers/ieee1394/hosts.c 2006-06-01 20:55:40.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/pci.h>
#include <linux/timer.h>
#include <linux/jiffies.h>
+#include <linux/mutex.h>

#include "csr1212.h"
#include "ieee1394.h"
@@ -105,7 +106,7 @@ static int alloc_hostnum_cb(struct hpsb_
* Return Value: a pointer to the &hpsb_host if succesful, %NULL if
* no memory was available.
*/
-static DECLARE_MUTEX(host_num_alloc);
+static DEFINE_MUTEX(host_num_alloc);

struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
struct device *dev)
@@ -148,7 +149,7 @@ struct hpsb_host *hpsb_alloc_host(struct
h->topology_map = h->csr.topology_map + 3;
h->speed_map = (u8 *)(h->csr.speed_map + 2);

- down(&host_num_alloc);
+ mutex_lock(&host_num_alloc);

while (nodemgr_for_each_host(&hostnum, alloc_hostnum_cb))
hostnum++;
@@ -167,7 +168,7 @@ struct hpsb_host *hpsb_alloc_host(struct
class_device_register(&h->class_dev);
get_device(&h->device);

- up(&host_num_alloc);
+ mutex_unlock(&host_num_alloc);

return h;
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-06-02 21:55    [W:0.035 / U:0.552 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site