Commit 656a05c8 authored by Felipe Balbi's avatar Felipe Balbi Committed by David S. Miller

net: ks8851: convert to threaded IRQ

just as it should have been. It also helps
removing the, now unnecessary, workqueue.
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08433eff
...@@ -69,7 +69,6 @@ union ks8851_tx_hdr { ...@@ -69,7 +69,6 @@ union ks8851_tx_hdr {
* @mii: The MII state information for the mii calls. * @mii: The MII state information for the mii calls.
* @rxctrl: RX settings for @rxctrl_work. * @rxctrl: RX settings for @rxctrl_work.
* @tx_work: Work queue for tx packets * @tx_work: Work queue for tx packets
* @irq_work: Work queue for servicing interrupts
* @rxctrl_work: Work queue for updating RX mode and multicast lists * @rxctrl_work: Work queue for updating RX mode and multicast lists
* @txq: Queue of packets for transmission. * @txq: Queue of packets for transmission.
* @spi_msg1: pre-setup SPI transfer with one message, @spi_xfer1. * @spi_msg1: pre-setup SPI transfer with one message, @spi_xfer1.
...@@ -121,7 +120,6 @@ struct ks8851_net { ...@@ -121,7 +120,6 @@ struct ks8851_net {
struct ks8851_rxctrl rxctrl; struct ks8851_rxctrl rxctrl;
struct work_struct tx_work; struct work_struct tx_work;
struct work_struct irq_work;
struct work_struct rxctrl_work; struct work_struct rxctrl_work;
struct sk_buff_head txq; struct sk_buff_head txq;
...@@ -443,23 +441,6 @@ static void ks8851_init_mac(struct ks8851_net *ks) ...@@ -443,23 +441,6 @@ static void ks8851_init_mac(struct ks8851_net *ks)
ks8851_write_mac_addr(dev); ks8851_write_mac_addr(dev);
} }
/**
* ks8851_irq - device interrupt handler
* @irq: Interrupt number passed from the IRQ handler.
* @pw: The private word passed to register_irq(), our struct ks8851_net.
*
* Disable the interrupt from happening again until we've processed the
* current status by scheduling ks8851_irq_work().
*/
static irqreturn_t ks8851_irq(int irq, void *pw)
{
struct ks8851_net *ks = pw;
disable_irq_nosync(irq);
schedule_work(&ks->irq_work);
return IRQ_HANDLED;
}
/** /**
* ks8851_rdfifo - read data from the receive fifo * ks8851_rdfifo - read data from the receive fifo
* @ks: The device state. * @ks: The device state.
...@@ -595,19 +576,20 @@ static void ks8851_rx_pkts(struct ks8851_net *ks) ...@@ -595,19 +576,20 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
} }
/** /**
* ks8851_irq_work - work queue handler for dealing with interrupt requests * ks8851_irq - IRQ handler for dealing with interrupt requests
* @work: The work structure that was scheduled by schedule_work() * @irq: IRQ number
* @_ks: cookie
* *
* This is the handler invoked when the ks8851_irq() is called to find out * This handler is invoked when the IRQ line asserts to find out what happened.
* what happened, as we cannot allow ourselves to sleep whilst waiting for * As we cannot allow ourselves to sleep in HARDIRQ context, this handler runs
* anything other process has the chip's lock. * in thread context.
* *
* Read the interrupt status, work out what needs to be done and then clear * Read the interrupt status, work out what needs to be done and then clear
* any of the interrupts that are not needed. * any of the interrupts that are not needed.
*/ */
static void ks8851_irq_work(struct work_struct *work) static irqreturn_t ks8851_irq(int irq, void *_ks)
{ {
struct ks8851_net *ks = container_of(work, struct ks8851_net, irq_work); struct ks8851_net *ks = _ks;
unsigned status; unsigned status;
unsigned handled = 0; unsigned handled = 0;
...@@ -688,7 +670,7 @@ static void ks8851_irq_work(struct work_struct *work) ...@@ -688,7 +670,7 @@ static void ks8851_irq_work(struct work_struct *work)
if (status & IRQ_TXI) if (status & IRQ_TXI)
netif_wake_queue(ks->netdev); netif_wake_queue(ks->netdev);
enable_irq(ks->netdev->irq); return IRQ_HANDLED;
} }
/** /**
...@@ -896,7 +878,6 @@ static int ks8851_net_stop(struct net_device *dev) ...@@ -896,7 +878,6 @@ static int ks8851_net_stop(struct net_device *dev)
mutex_unlock(&ks->lock); mutex_unlock(&ks->lock);
/* stop any outstanding work */ /* stop any outstanding work */
flush_work(&ks->irq_work);
flush_work(&ks->tx_work); flush_work(&ks->tx_work);
flush_work(&ks->rxctrl_work); flush_work(&ks->rxctrl_work);
...@@ -1437,7 +1418,6 @@ static int ks8851_probe(struct spi_device *spi) ...@@ -1437,7 +1418,6 @@ static int ks8851_probe(struct spi_device *spi)
spin_lock_init(&ks->statelock); spin_lock_init(&ks->statelock);
INIT_WORK(&ks->tx_work, ks8851_tx_work); INIT_WORK(&ks->tx_work, ks8851_tx_work);
INIT_WORK(&ks->irq_work, ks8851_irq_work);
INIT_WORK(&ks->rxctrl_work, ks8851_rxctrl_work); INIT_WORK(&ks->rxctrl_work, ks8851_rxctrl_work);
/* initialise pre-made spi transfer messages */ /* initialise pre-made spi transfer messages */
...@@ -1504,7 +1484,8 @@ static int ks8851_probe(struct spi_device *spi) ...@@ -1504,7 +1484,8 @@ static int ks8851_probe(struct spi_device *spi)
ks8851_read_selftest(ks); ks8851_read_selftest(ks);
ks8851_init_mac(ks); ks8851_init_mac(ks);
ret = request_irq(spi->irq, ks8851_irq, IRQF_TRIGGER_LOW, ret = request_threaded_irq(spi->irq, NULL, ks8851_irq,
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
ndev->name, ks); ndev->name, ks);
if (ret < 0) { if (ret < 0) {
dev_err(&spi->dev, "failed to get irq\n"); dev_err(&spi->dev, "failed to get irq\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment