diff options
| author | Wang Shaoyan <wangshaoyan.pt@taobao.com> | 2011-07-08 03:01:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-08 09:06:31 -0700 |
| commit | 135d23d66c53ade614c288d422f4c4b3205eb201 (patch) | |
| tree | b32372abb251da59971576493e5bc24467904060 | |
| parent | 498d8e236304a62a2774d7264bdff2c6e8102b5b (diff) | |
| download | linux-135d23d66c53ade614c288d422f4c4b3205eb201.tar.gz linux-135d23d66c53ade614c288d422f4c4b3205eb201.tar.bz2 linux-135d23d66c53ade614c288d422f4c4b3205eb201.zip | |
ATM: Delete no use FILL_RX_POOLS_IN_BH marco
The macro FILL_RX_POOLS_IN_BH is never been used, in order to avoid
the compiler reports error because of the usage of function INIT_WORK,
we just delete the marco.
Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Cc: linux-atm-general@lists.sourceforge.net
Signed-off-by: Wang Shaoyan <wangshaoyan.pt@taobao.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/atm/ambassador.c | 11 | ||||
| -rw-r--r-- | drivers/atm/ambassador.h | 4 |
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index a5fcb1eb862f..bb3b016b6ce8 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c @@ -813,7 +813,7 @@ static void fill_rx_pool (amb_dev * dev, unsigned char pool, return; } -// top up all RX pools (can also be called as a bottom half) +// top up all RX pools static void fill_rx_pools (amb_dev * dev) { unsigned char pool; @@ -872,11 +872,7 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id) { ++irq_work; if (irq_work) { -#ifdef FILL_RX_POOLS_IN_BH - schedule_work (&dev->bh); -#else fill_rx_pools (dev); -#endif PRINTD (DBG_IRQ, "work done: %u", irq_work); } else { @@ -2154,11 +2150,6 @@ static void setup_dev(amb_dev *dev, struct pci_dev *pci_dev) dev->tx_avail = ATM_OC3_PCR; dev->rx_avail = ATM_OC3_PCR; -#ifdef FILL_RX_POOLS_IN_BH - // initialise bottom half - INIT_WORK(&dev->bh, (void (*)(void *)) fill_rx_pools, dev); -#endif - // semaphore for txer/rxer modifications - we cannot use a // spinlock as the critical region needs to switch processes mutex_init(&dev->vcc_sf); diff --git a/drivers/atm/ambassador.h b/drivers/atm/ambassador.h index bd1c46a7ef49..aa9710556bd6 100644 --- a/drivers/atm/ambassador.h +++ b/drivers/atm/ambassador.h @@ -630,10 +630,6 @@ struct amb_dev { u32 iobase; u32 * membase; -#ifdef FILL_RX_POOLS_IN_BH - struct work_struct bh; -#endif - amb_cq cq; amb_txq txq; amb_rxq rxq[NUM_RX_POOLS]; |