diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-20 07:45:57 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-22 05:59:44 -0400 |
commit | ac019360fe311dd6aa11b358a02eb3a61675882e (patch) | |
tree | dfbfeb253ba43c3142c8a06e22bfea5182d700f3 /drivers/bluetooth | |
parent | 166d2f6a4332aad53cb0750a296f76c06102552d (diff) |
[Bluetooth] Eliminate checks for impossible conditions in IRQ handler
Our info structure and info->hdev is always passed to the IRQ handler,
so we don't have to worry about these checks in every interrupt.
Leave a BUG_ON() just to help unwary programmers, but these could
probably be removed as well.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 5 | ||||
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 5 | ||||
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 5 | ||||
-rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 5 |
4 files changed, 4 insertions, 16 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 851de4d5b7de..bcf57927b7a8 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
@@ -503,10 +503,7 @@ static irqreturn_t bluecard_interrupt(int irq, void *dev_inst) | |||
503 | unsigned int iobase; | 503 | unsigned int iobase; |
504 | unsigned char reg; | 504 | unsigned char reg; |
505 | 505 | ||
506 | if (!info || !info->hdev) { | 506 | BUG_ON(!info->hdev); |
507 | BT_ERR("Call of irq %d for unknown device", irq); | ||
508 | return IRQ_NONE; | ||
509 | } | ||
510 | 507 | ||
511 | if (!test_bit(CARD_READY, &(info->hw_state))) | 508 | if (!test_bit(CARD_READY, &(info->hw_state))) |
512 | return IRQ_HANDLED; | 509 | return IRQ_HANDLED; |
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 39516074636b..a18f9b8c9e12 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -344,10 +344,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) | |||
344 | unsigned int iobase; | 344 | unsigned int iobase; |
345 | int iir; | 345 | int iir; |
346 | 346 | ||
347 | if (!info || !info->hdev) { | 347 | BUG_ON(!info->hdev); |
348 | BT_ERR("Call of irq %d for unknown device", irq); | ||
349 | return IRQ_NONE; | ||
350 | } | ||
351 | 348 | ||
352 | iobase = info->p_dev->io.BasePort1; | 349 | iobase = info->p_dev->io.BasePort1; |
353 | 350 | ||
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index d7d2ea0d86a1..08f48d577aba 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -294,10 +294,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst) | |||
294 | int boguscount = 0; | 294 | int boguscount = 0; |
295 | int iir, lsr; | 295 | int iir, lsr; |
296 | 296 | ||
297 | if (!info || !info->hdev) { | 297 | BUG_ON(!info->hdev); |
298 | BT_ERR("Call of irq %d for unknown device", irq); | ||
299 | return IRQ_NONE; | ||
300 | } | ||
301 | 298 | ||
302 | iobase = info->p_dev->io.BasePort1; | 299 | iobase = info->p_dev->io.BasePort1; |
303 | 300 | ||
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 7f9c54b9964a..dae45cdf02b2 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -298,10 +298,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst) | |||
298 | int boguscount = 0; | 298 | int boguscount = 0; |
299 | int iir, lsr; | 299 | int iir, lsr; |
300 | 300 | ||
301 | if (!info || !info->hdev) { | 301 | BUG_ON(!info->hdev); |
302 | BT_ERR("Call of irq %d for unknown device", irq); | ||
303 | return IRQ_NONE; | ||
304 | } | ||
305 | 302 | ||
306 | iobase = info->p_dev->io.BasePort1; | 303 | iobase = info->p_dev->io.BasePort1; |
307 | 304 | ||