Skip to contentSkip to conversation

Prism54: Convert mgmt_sem to the mutex API

PATCH In review Matthias Kaehlcke 2 participants 3 messages Nov 4, 2007 – Nov 5, 2007 Networking drivers (wireless)

lore
Share & tools
lore

Matthias Kaehlcke

author
#0 lore raw

PATCH 1/1 Prism54: Convert mgmt_sem to the mutex API

Prism54: Convert mgmt_sem to the mutex API

Signed-off-by Matthias Kaehlcke <[email protected]>

--

drivers/net/wireless/prism54/islpci_dev.c +1 -1
index 219dd65..dbb538c 100644
@@ -861,7 +861,7 @@ islpci_setup(struct pci_dev *pdev)
 	init_waitqueue_head(&priv->reset_done);
 
 	/* init the queue read locks, process wait counter */
-	sema_init(&priv->mgmt_sem, 1);
+	mutex_init(&priv->mgmt_lock);
 	priv->mgmt_received = NULL;
 	init_waitqueue_head(&priv->mgmt_wqueue);
 	sema_init(&priv->stats_sem, 1);
drivers/net/wireless/prism54/islpci_dev.h +2 -1
index 736666d..4e0182c 100644
@@ -26,6 +26,7 @@
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 
 #include "isl_38xx.h"
 #include "isl_oid.h"

@@ -164,7 +165,7 @@ typedef struct {
 	wait_queue_head_t reset_done;
 
 	/* used by islpci_mgt_transaction */
-	struct semaphore mgmt_sem; /* serialize access to mailbox and wqueue */
+	struct mutex mgmt_lock; /* serialize access to mailbox and wqueue */
 	struct islpci_mgmtframe *mgmt_received;	  /* mbox for incoming frame */
 	wait_queue_head_t mgmt_wqueue;            /* waitqueue for mbox */
Signature · 10 lines
Matthias Kaehlcke
Linux Application Developer
Barcelona

       The yellow ships hung in the air just like bricks dont do
                 (The Hitch-Hiker's Guide to the Galaxy)
                                                                 .''`.
    using free software / Debian GNU/Linux | http://debian.org  : :'  :
                                                                `. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4                  `-
#1 lore raw
Quoted 32 lines · On Thursday 01 November 2007 08:19:02 Matthias Kaehlcke wrote:

Prism54: Convert mgmt_sem to the mutex API

Signed-off-by Matthias Kaehlcke <[email protected]>

--

drivers/net/wireless/prism54/islpci_dev.c +1 -1
index 219dd65..dbb538c 100644
@@ -861,7 +861,7 @@ islpci_setup(struct pci_dev *pdev)
 	init_waitqueue_head(&priv->reset_done);
 
 	/* init the queue read locks, process wait counter */
-	sema_init(&priv->mgmt_sem, 1);
+	mutex_init(&priv->mgmt_lock);
 	priv->mgmt_received = NULL;
 	init_waitqueue_head(&priv->mgmt_wqueue);
 	sema_init(&priv->stats_sem, 1);
drivers/net/wireless/prism54/islpci_dev.h +1 -0
index 736666d..4e0182c 100644
@@ -26,6 +26,7 @@
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 
 #include "isl_38xx.h"
 #include "isl_oid.h"

drivers/net/wireless/prism54/islpci_dev.h typedef struct { · line 171

Quoted 8 lines
drivers/net/wireless/prism54/islpci_dev.h +1 -1
@@ -164,7 +165,7 @@ typedef struct {
 	wait_queue_head_t reset_done;
 
 	/* used by islpci_mgt_transaction */
-	struct semaphore mgmt_sem; /* serialize access to mailbox and wqueue */
+	struct mutex mgmt_lock; /* serialize access to mailbox and wqueue */
 	struct islpci_mgmtframe *mgmt_received;	  /* mbox for incoming frame */
 	wait_queue_head_t mgmt_wqueue;            /* waitqueue for mbox */

Uhm, so this mutex is not used? Why not remove it then?

Signature · 1 line
Greetings Michael.
author
#2 lore raw

El Mon, Nov 05, 2007 at 12:36:13AM +0100 Michael Buesch ha dit:

Quoted 7 lines · On Thursday 01 November 2007 08:19:02 Matthias Kaehlcke wrote:
Quoted 4 lines

Prism54: Convert mgmt_sem to the mutex API

Signed-off-by Matthias Kaehlcke <[email protected]>

Uhm, so this mutex is not used? Why not remove it then?

i apologize, the patch i submitted is incorrect, a file is missing. here is the correct version

--

Prism54: Convert mgmt_sem to the mutex API

Signed-off-by Matthias Kaehlcke <[email protected]>

--

drivers/net/wireless/prism54/islpci_dev.c +1 -1
index 219dd65..dbb538c 100644
@@ -861,7 +861,7 @@ islpci_setup(struct pci_dev *pdev)
 	init_waitqueue_head(&priv->reset_done);
 
 	/* init the queue read locks, process wait counter */
-	sema_init(&priv->mgmt_sem, 1);
+	mutex_init(&priv->mgmt_lock);
 	priv->mgmt_received = NULL;
 	init_waitqueue_head(&priv->mgmt_wqueue);
 	sema_init(&priv->stats_sem, 1);
drivers/net/wireless/prism54/islpci_dev.h +2 -1
index 736666d..4e0182c 100644
@@ -26,6 +26,7 @@
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 
 #include "isl_38xx.h"
 #include "isl_oid.h"

@@ -164,7 +165,7 @@ typedef struct {
 	wait_queue_head_t reset_done;
 
 	/* used by islpci_mgt_transaction */
-	struct semaphore mgmt_sem; /* serialize access to mailbox and wqueue */
+	struct mutex mgmt_lock; /* serialize access to mailbox and wqueue */
 	struct islpci_mgmtframe *mgmt_received;	  /* mbox for incoming frame */
 	wait_queue_head_t mgmt_wqueue;            /* waitqueue for mbox */
drivers/net/wireless/prism54/islpci_mgt.c +2 -2
index 2246f79..f7c677e 100644
@@ -460,7 +460,7 @@ islpci_mgt_transaction(struct net_device *ndev,
 
 	*recvframe = NULL;
 
-	if (down_interruptible(&priv->mgmt_sem))
+	if (mutex_lock_interruptible(&priv->mgmt_lock))
 		return -ERESTARTSYS;
 
 	prepare_to_wait(&priv->mgmt_wqueue, &wait, TASK_UNINTERRUPTIBLE);

@@ -504,7 +504,7 @@ islpci_mgt_transaction(struct net_device *ndev,
 	/* TODO: we should reset the device here */
  out:
 	finish_wait(&priv->mgmt_wqueue, &wait);
-	up(&priv->mgmt_sem);
+	mutex_unlock(&priv->mgmt_lock);
 	return err;
 }
Signature · 10 lines
Matthias Kaehlcke
Linux Application Developer
Barcelona

     La guerra es un acto abominable en el que se matan personas que no
      se conocen, dirigidas por personas que se conocen y no se matan
                                                                 .''`.
    using free software / Debian GNU/Linux | http://debian.org  : :'  :
                                                                `. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4                  `-