Prism54: Convert mgmt_sem to the mutex API

[cascardo/linux.git] / drivers / net / wireless / prism54 / islpci_mgt.c

diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 036a875..f7c677e 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -386,7 +386,7 @@ islpci_mgt_receive(struct net_device *ndev)
 
                        /* Create work to handle trap out of interrupt
                         * context. */
-                       INIT_WORK(&frame->ws, prism54_process_trap, frame);
+                       INIT_WORK(&frame->ws, prism54_process_trap);
                        schedule_work(&frame->ws);
 
                } else {
@@ -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;
 }