libertas: clean up lbs_interrupt()

Make it take struct lbs_private as argument; that's all it wants anyway,
and all callers were starting off from that. Don't wake the netif
queues, because those should be handled elsewhere. And sort out the
locking, with a big nasty warning for those who don't have the
driver_lock locked when they call it.

Oh, and fix if_cs.c to lock the driver_lock before calling it.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 24239609367f..1ed72b9b6bf2 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -154,7 +154,7 @@ static int if_sdio_handle_cmd(struct if_sdio_card *card,
 
         card->int_cause |= MRVDRV_CMD_UPLD_RDY;
 
-        lbs_interrupt(card->priv->dev);
+        lbs_interrupt(card->priv);
 
         ret = 0;
 
@@ -236,7 +236,7 @@ static int if_sdio_handle_event(struct if_sdio_card *card,
         card->event = event;
         card->int_cause |= MRVDRV_CARDEVENT;
 
-        lbs_interrupt(card->priv->dev);
+        lbs_interrupt(card->priv);
 
         spin_unlock_irqrestore(&card->priv->driver_lock, flags);