Home » Mailing list archives » linux-kernel » 2008 » March » 6

[PATCH 2/5] net: ehea: ehea_fw_handles semaphore to mutex

Previous thread: [PATCH 4/5] net: ehea: bcmc_regs semaphore to mutex by Daniel Walker on Thursday, March 6, 2008 - 1:00 am. (1 message)

Next thread: [PATCH 3/5] net: ehea: locking order correction by Daniel Walker on Thursday, March 6, 2008 - 1:00 am. (1 message)
[view original message]
From: Daniel Walker
Subject: [PATCH 2/5] net: ehea: ehea_fw_handles semaphore to mutex
Date: Thursday, March 6, 2008 - 1:00 am

-- 
Content-Disposition: inline; filename=net-ehea-fw_handles-semaphore-to-mutex.patch

Converted the ehea_fw_handles.lock to a mutex.

Signed-off-by: Daniel Walker <dwalker@mvista.com>

---
 drivers/net/ehea/ehea.h      |    2 +-
 drivers/net/ehea/ehea_main.c |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

Index: linux-2.6.24/drivers/net/ehea/ehea.h
===================================================================
--- linux-2.6.24.orig/drivers/net/ehea/ehea.h
+++ linux-2.6.24/drivers/net/ehea/ehea.h
@@ -421,7 +421,7 @@ struct ehea_fw_handle_entry {
 struct ehea_fw_handle_array {
 	struct ehea_fw_handle_entry *arr;
 	int num_entries;
-	struct semaphore lock;
+	struct mutex lock;
 };
 
 struct ehea_bcmc_reg_entry {
Index: linux-2.6.24/drivers/net/ehea/ehea_main.c
===================================================================
--- linux-2.6.24.orig/drivers/net/ehea/ehea_main.c
+++ linux-2.6.24/drivers/net/ehea/ehea_main.c
@@ -2453,7 +2453,7 @@ static int ehea_up(struct net_device *de
 	if (port->state == EHEA_PORT_UP)
 		return 0;
 
-	down(&ehea_fw_handles.lock);
+	mutex_lock(&ehea_fw_handles.lock);
 
 	ret = ehea_port_res_setup(port, port->num_def_qps,
 				  port->num_add_tx_qps);
@@ -2517,7 +2517,7 @@ out:
 	up(&ehea_bcmc_regs.lock);
 
 	ehea_update_firmware_handles();
-	up(&ehea_fw_handles.lock);
+	mutex_unlock(&ehea_fw_handles.lock);
 
 	return ret;
 }
@@ -2573,7 +2573,7 @@ static int ehea_down(struct net_device *
 
 	ehea_free_interrupts(dev);
 
-	down(&ehea_fw_handles.lock);
+	mutex_lock(&ehea_fw_handles.lock);
 
 	port->state = EHEA_PORT_DOWN;
 
@@ -2586,7 +2586,7 @@ static int ehea_down(struct net_device *
 			  dev->name, ret);
 
 	ehea_update_firmware_handles();
-	up(&ehea_fw_handles.lock);
+	mutex_unlock(&ehea_fw_handles.lock);
 
 	return ret;
 }
@@ -3343,7 +3343,7 @@ static int __devinit ehea_probe_adapter(
 		ehea_error("Invalid ibmebus device probed");
 		return -EINVAL;
 ...
[ message continues ]
Previous thread: [PATCH 4/5] net: ehea: bcmc_regs semaphore to mutex by Daniel Walker on Thursday, March 6, 2008 - 1:00 am. (1 message)

Next thread: [PATCH 3/5] net: ehea: locking order correction by Daniel Walker on Thursday, March 6, 2008 - 1:00 am. (1 message)