Home » Mailing list archives » linux-kernel » 2007 » November » 13

[PATCH] QLogic InfiniPath: convert ipath_eep_sem to mutex

Previous thread: [patch 3/3] Linux Kernel Markers - fix samples to follow format string standard by Mathieu Desnoyers on Tuesday, November 13, 2007 - 2:39 pm. (1 message)

Next thread: [patch 04/11] Add INIT_ARRAY() to kernel.h by Mathieu Desnoyers on Tuesday, November 13, 2007 - 2:46 pm. (1 message)
[view original message]
From: Matthias Kaehlcke <matthias.kaehlcke@...>
To: <rolandd@...>, <mshefty@...>, <hal.rosenstock@...>, <general@...>
Cc: <linux-kernel@...>, <akpm@...>
Subject: [PATCH] QLogic InfiniPath: convert ipath_eep_sem to mutex
Date: Tuesday, November 13, 2007 - 2:45 pm

[Empty message]
[view original message]
From: Roland Dreier <rdreier@...>
To: <infinipath@...>
Cc: Matthias Kaehlcke <matthias.kaehlcke@...>, <general@...>, <linux-kernel@...>, <akpm@...>
Subject: Re: [PATCH] QLogic InfiniPath: convert ipath_eep_sem to mutex
Date: Wednesday, November 14, 2007 - 4:56 pm

[ Forwarding to ipath entry from MAINTAINERS file... if someone from

  Qlogic will ACK this, I'll add it to my tree for 2.6.25 - Roland ]


QLogic InfiniPath: convert the semaphore ipath_eep_sem to the mutex

API


Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>


--


diff --git a/drivers/infiniband/hw/ipath/ipath_eeprom.c b/drivers/infiniband/hw/ipath/ipath_eeprom.c

index e7c25db..a5b6299 100644

--- a/drivers/infiniband/hw/ipath/ipath_eeprom.c

+++ b/drivers/infiniband/hw/ipath/ipath_eeprom.c

@@ -510,10 +510,10 @@ int ipath_eeprom_read(struct ipath_devdata *dd, u8 eeprom_offset,

 {

 	int ret;


-	ret = down_interruptible(&dd->ipath_eep_sem);

+	ret = mutex_lock_interruptible(&dd->ipath_eep_lock);

 	if (!ret) {

 		ret = ipath_eeprom_internal_read(dd, eeprom_offset, buff, len);

-		up(&dd->ipath_eep_sem);

+		mutex_unlock(&dd->ipath_eep_lock);

 	}


 	return ret;

@@ -524,10 +524,10 @@ int ipath_eeprom_write(struct ipath_devdata *dd, u8 eeprom_offset,

 {

 	int ret;


-	ret = down_interruptible(&dd->ipath_eep_sem);

+	ret = mutex_lock_interruptible(&dd->ipath_eep_lock);

 	if (!ret) {

 		ret = ipath_eeprom_internal_write(dd, eeprom_offset, buff, len);

-		up(&dd->ipath_eep_sem);

+		mutex_unlock(&dd->ipath_eep_lock);

 	}


 	return ret;

@@ -616,9 +616,9 @@ void ipath_get_eeprom_info(struct ipath_devdata *dd)

 		goto bail;

 	}


-	down(&dd->ipath_eep_sem);

+	mutex_lock(&dd->ipath_eep_lock);

 	eep_stat = ipath_eeprom_internal_read(dd, 0, buf, len);

-	up(&dd->ipath_eep_sem);

+	mutex_unlock(&dd->ipath_eep_lock);


 	if (eep_stat) {

 		ipath_dev_err(dd, "Failed reading GUID from eeprom\n");

@@ -764,14 +764,14 @@ int ipath_update_eeprom_log(struct ipath_devdata *dd)

 	/* Grab semaphore and read current EEPROM. If we get an

 	 * error, let go, but if not, keep it until we finish write.

 	 */

-	ret = down_interruptible(&dd->ipath_eep_sem);

+	ret = mutex_lock_interruptib...
[ message continues ]
[view original message]
From: Arthur Jones <arthur.jones@...>
To: Roland Dreier <rdreier@...>
Cc: <infinipath@...>, Matthias Kaehlcke <matthias.kaehlcke@...>, <general@...>, <linux-kernel@...>, <akpm@...>
Subject: Re: [PATCH] QLogic InfiniPath: convert ipath_eep_sem to mutex
Date: Thursday, November 15, 2007 - 1:10 pm

hi roland,  thanks for picking this up...


Acked-by: Michael Albaugh <Michael.Albaugh@qlogic.com>

Tested-by: Arthur Jones <arthur.jones@qlogic.com>


arthur

-
Previous thread: [patch 3/3] Linux Kernel Markers - fix samples to follow format string standard by Mathieu Desnoyers on Tuesday, November 13, 2007 - 2:39 pm. (1 message)

Next thread: [patch 04/11] Add INIT_ARRAY() to kernel.h by Mathieu Desnoyers on Tuesday, November 13, 2007 - 2:46 pm. (1 message)