Skip to contentSkip to conversation

firewire : Use mutex instead of semaphore in driver core

PATCH In review Dave Young 2 participants 2 messages Dec 29, 2007 Firewire

lore
Share & tools
lore

Dave Young

author
#0 lore raw

PATCH 3/12 firewire : Use mutex instead of semaphore in driver core

---
drivers/firewire/fw-device.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firewire/fw-device.c +3 -3
diff -upr linux/drivers/firewire/fw-device.c linux.new/drivers/firewire/fw-device.c
@@ -26,7 +26,7 @@
 #include <linux/delay.h>
 #include <linux/idr.h>
 #include <linux/rwsem.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 #include <linux/ctype.h>
 #include "fw-transaction.h"
 #include "fw-topology.h"
@@ -731,9 +731,9 @@ static int update_unit(struct device *de
 	struct fw_driver *driver = (struct fw_driver *)dev->driver;
 
 	if (is_fw_unit(dev) && driver != NULL && driver->update != NULL) {
-		down(&dev->sem);
+		mutex_lock(&dev->mutex);
 		driver->update(unit);
-		up(&dev->sem);
+		mutex_unlock(&dev->mutex);
 	}
 
 	return 0;
#1 lore raw
Quoted 13 lines · Dave Young
drivers/firewire/fw-device.c +1 -1
@@ -26,7 +26,7 @@
 #include <linux/delay.h>
 #include <linux/idr.h>
 #include <linux/rwsem.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 #include <linux/ctype.h>
 #include "fw-transaction.h"
 #include "fw-topology.h"
@@ -731,9 +731,9 @@ static int update_unit(struct device *de
 	struct fw_driver *driver = (struct fw_driver *)dev->driver;

drivers/firewire/fw-device.c static int update_unit(struct device *de · line 739

Quoted 10 lines
drivers/firewire/fw-device.c +2 -2
 
 	if (is_fw_unit(dev) && driver != NULL && driver->update != NULL) {
-		down(&dev->sem);
+		mutex_lock(&dev->mutex);
 		driver->update(unit);
-		up(&dev->sem);
+		mutex_unlock(&dev->mutex);
 	}
 
 	return 0;

ACK to this part of the series.

Signature · 3 lines
Stefan Richter
-=====-=-=== ==-- ===-=
http://arcgraph.de/sr/