openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
David Woodhouse 2007-12-10 14:58:37 -05:00 committed by David S. Miller
parent 1309b55b4d
commit 4f67949656
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/libertas/decl.h
View File

@ -39,7 +39,7 @@ void lbs_queue_cmd(struct lbs_private *priv,
int lbs_allocate_cmd_buffer(struct lbs_private *priv); int lbs_allocate_cmd_buffer(struct lbs_private *priv);
int lbs_execute_next_command(struct lbs_private *priv); int lbs_execute_next_command(struct lbs_private *priv);
int lbs_process_event(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); int lbs_set_radio_control(struct lbs_private *priv);
u32 lbs_fw_index_to_data_rate(u8 index); u32 lbs_fw_index_to_data_rate(u8 index);
u8 lbs_data_rate_to_fw_index(u32 rate); u8 lbs_data_rate_to_fw_index(u32 rate);

5
drivers/net/wireless/libertas/if_cs.c
View File

@ -264,8 +264,9 @@ static irqreturn_t if_cs_interrupt(int irq, void *data)
/* clear interrupt */ /* clear interrupt */
if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause & IF_CS_C_IC_MASK); if_cs_write16(card, IF_CS_C_INT_CAUSE, int_cause & IF_CS_C_IC_MASK);
} }
spin_lock(&card->priv->driver_lock);
lbs_interrupt(card->priv->dev); lbs_interrupt(card->priv);
spin_unlock(&card->priv->driver_lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

4
drivers/net/wireless/libertas/if_sdio.c
View File

@ -154,7 +154,7 @@ static int if_sdio_handle_cmd(struct if_sdio_card *card,
card->int_cause |= MRVDRV_CMD_UPLD_RDY; card->int_cause |= MRVDRV_CMD_UPLD_RDY;
lbs_interrupt(card->priv->dev); lbs_interrupt(card->priv);
ret = 0; ret = 0;
@ -236,7 +236,7 @@ static int if_sdio_handle_event(struct if_sdio_card *card,
card->event = event; card->event = event;
card->int_cause |= MRVDRV_CARDEVENT; card->int_cause |= MRVDRV_CARDEVENT;
lbs_interrupt(card->priv->dev); lbs_interrupt(card->priv);
spin_unlock_irqrestore(&card->priv->driver_lock, flags); spin_unlock_irqrestore(&card->priv->driver_lock, flags);

4
drivers/net/wireless/libertas/if_usb.c
View File

@ -632,7 +632,7 @@ static inline void process_cmdrequest(int recvlength, u8 *recvbuff,
priv->upld_len); priv->upld_len);
kfree_skb(skb); kfree_skb(skb);
lbs_interrupt(priv->dev); lbs_interrupt(priv);
spin_unlock(&priv->driver_lock); spin_unlock(&priv->driver_lock);
lbs_deb_usbd(&cardp->udev->dev, 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_event_cause <<= 3;
cardp->usb_int_cause |= MRVDRV_CARDEVENT; cardp->usb_int_cause |= MRVDRV_CARDEVENT;
kfree_skb(skb); kfree_skb(skb);
lbs_interrupt(priv->dev); lbs_interrupt(priv);
spin_unlock(&priv->driver_lock); spin_unlock(&priv->driver_lock);
goto rx_exit; goto rx_exit;
default: default:

19
drivers/net/wireless/libertas/main.c
View File

@ -1408,23 +1408,22 @@ int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band)
* @param dev A pointer to net_device structure * @param dev A pointer to net_device structure
* @return n/a * @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_enter(LBS_DEB_THREAD);
lbs_deb_thread("lbs_interrupt: intcounter=%d\n", lbs_deb_thread("lbs_interrupt: intcounter=%d\n", priv->intcounter);
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++; priv->intcounter++;
if (priv->psstate == PS_STATE_SLEEP) { if (priv->psstate == PS_STATE_SLEEP)
priv->psstate = PS_STATE_AWAKE; priv->psstate = PS_STATE_AWAKE;
netif_wake_queue(dev);
if (priv->mesh_dev)
netif_wake_queue(priv->mesh_dev);
}
wake_up_interruptible(&priv->waitq); wake_up_interruptible(&priv->waitq);