Re: [PATCH] Prism54: Convert mgmt_sem to the mutex API

From: Michael Buesch
Date: Sun Nov 04 2007 - 18:37:20 EST


On Thursday 01 November 2007 08:19:02 Matthias Kaehlcke wrote:
> Prism54: Convert mgmt_sem to the mutex API
>
> Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
>
> --
>
> diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
> index 219dd65..dbb538c 100644
> --- a/drivers/net/wireless/prism54/islpci_dev.c
> +++ b/drivers/net/wireless/prism54/islpci_dev.c
> @@ -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);
> diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h
> index 736666d..4e0182c 100644
> --- a/drivers/net/wireless/prism54/islpci_dev.h
> +++ b/drivers/net/wireless/prism54/islpci_dev.h
> @@ -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 */
>

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

--
Greetings Michael.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/