lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ATM: Delete no use FILL_RX_POOLS_IN_BH marco

Browse Source 
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>
This commit is contained in:
Wang Shaoyan
2011-07-08 03:01:43 +00:00
committed by David S. Miller
parent 498d8e2363
commit 135d23d66c
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/atm/ambassador.c
View File

@@ -813,7 +813,7 @@ static void fill_rx_pool (amb_dev * dev, unsigned char pool,
return; 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) { static void fill_rx_pools (amb_dev * dev) {
unsigned char pool; unsigned char pool;
@@ -872,11 +872,7 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id) {
++irq_work; ++irq_work;
if (irq_work) { if (irq_work) {
#ifdef FILL_RX_POOLS_IN_BH
schedule_work (&dev->bh);
#else
fill_rx_pools (dev); fill_rx_pools (dev);
#endif
PRINTD (DBG_IRQ, "work done: %u", irq_work); PRINTD (DBG_IRQ, "work done: %u", irq_work);
} else { } else {
@@ -2154,11 +2150,6 @@ static void setup_dev(amb_dev *dev, struct pci_dev *pci_dev)
dev->tx_avail = ATM_OC3_PCR; dev->tx_avail = ATM_OC3_PCR;
dev->rx_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 // semaphore for txer/rxer modifications - we cannot use a
// spinlock as the critical region needs to switch processes // spinlock as the critical region needs to switch processes
mutex_init(&dev->vcc_sf); mutex_init(&dev->vcc_sf);

4
drivers/atm/ambassador.h
View File

@@ -630,10 +630,6 @@ struct amb_dev {
u32 iobase; u32 iobase;
u32 * membase; u32 * membase;
#ifdef FILL_RX_POOLS_IN_BH
struct work_struct bh;
#endif
amb_cq cq; amb_cq cq;
amb_txq txq; amb_txq txq;
amb_rxq rxq[NUM_RX_POOLS]; amb_rxq rxq[NUM_RX_POOLS];