Commit 1b34fd39 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by David S. Miller
Browse files

Prism54: Convert mgmt_sem to the mutex API 



Signed-off-by: default avatarMatthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1e3428e9

drivers/net/wireless/prism54/islpci_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

}