Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f679496 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

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: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1309b55b

drivers/net/wireless/libertas/decl.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void lbs_queue_cmd(struct lbs_private *priv, 
int lbs_allocate_cmd_buffer(struct lbs_private *priv);

int lbs_execute_next_command(struct lbs_private *priv);

int lbs_process_event(struct lbs_private *priv);

void lbs_interrupt(struct net_device *);

void lbs_interrupt(struct lbs_private *priv);

int lbs_set_radio_control(struct lbs_private *priv);

u32 lbs_fw_index_to_data_rate(u8 index);

u8 lbs_data_rate_to_fw_index(u32 rate);

drivers/net/wireless/libertas/if_cs.c

+3 −2
Original line number Diff line number Diff line
@@ -264,8 +264,9 @@ static irqreturn_t if_cs_interrupt(int irq, void *data) 
		/* clear interrupt */

		if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause & IF_CS_C_IC_MASK);

	}



	lbs_interrupt(card->priv->dev);

	spin_lock(&card->priv->driver_lock);

	lbs_interrupt(card->priv);

	spin_unlock(&card->priv->driver_lock);



	return IRQ_HANDLED;

}

drivers/net/wireless/libertas/if_sdio.c

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

drivers/net/wireless/libertas/if_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static inline void process_cmdrequest(int recvlength, u8 *recvbuff, 
	       priv->upld_len);



	kfree_skb(skb);

	lbs_interrupt(priv->dev);

	lbs_interrupt(priv);

	spin_unlock(&priv->driver_lock);



	lbs_deb_usbd(&cardp->udev->dev,
@@ -705,7 +705,7 @@ static void if_usb_receive(struct urb *urb) 
		cardp->usb_event_cause <<= 3;

		cardp->usb_int_cause |= MRVDRV_CARDEVENT;

		kfree_skb(skb);

		lbs_interrupt(priv->dev);

		lbs_interrupt(priv);

		spin_unlock(&priv->driver_lock);

		goto rx_exit;

	default:

drivers/net/wireless/libertas/main.c

+9 −10
Original line number Diff line number Diff line
@@ -1408,23 +1408,22 @@ int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band) 
 *  @param dev     A pointer to net_device structure

 *  @return 	   n/a

 */

void lbs_interrupt(struct net_device *dev)

void lbs_interrupt(struct lbs_private *priv)

{

	struct lbs_private *priv = dev->priv;



	lbs_deb_enter(LBS_DEB_THREAD);



	lbs_deb_thread("lbs_interrupt: intcounter=%d\n",

	       priv->intcounter);

	lbs_deb_thread("lbs_interrupt: intcounter=%d\n", priv->intcounter);



	if (spin_trylock(&priv->driver_lock)) {

		spin_unlock(&priv->driver_lock);

		printk(KERN_CRIT "%s called without driver_lock held\n", __func__);

		WARN_ON(1);

	}



	priv->intcounter++;



	if (priv->psstate == PS_STATE_SLEEP) {

	if (priv->psstate == PS_STATE_SLEEP)

		priv->psstate = PS_STATE_AWAKE;

		netif_wake_queue(dev);

		if (priv->mesh_dev)

			netif_wake_queue(priv->mesh_dev);

	}



	wake_up_interruptible(&priv->waitq);