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

ide: remove now redundant ->cur_dev checks

Browse Source 
* ->cur_dev should now be always valid if ->handler is set so
  remove redundant checks from ide_intr() and ide_timer_expiry().

* Apply CodingStyle fixups in ide_timer_expiry() while at it.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-01-06 17:20:59 +01:00
parent 94c96445f3
commit c38714ed44
1 changed files with 46 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
drivers/ide/ide-io.c
View File

@@ -920,60 +920,55 @@ void ide_timer_expiry (unsigned long data)
* Either way, we don't really want to complain about anything. * Either way, we don't really want to complain about anything.
*/ */
} else { } else {
drive = hwif->cur_dev; ide_expiry_t *expiry = hwif->expiry;
if (!drive) { ide_startstop_t startstop = ide_stopped;
printk(KERN_ERR "%s: ->cur_dev was NULL\n", __func__);
hwif->handler = NULL;
} else {
ide_expiry_t *expiry = hwif->expiry;
ide_startstop_t startstop = ide_stopped;
if (expiry) { drive = hwif->cur_dev;
/* continue */
if ((wait = expiry(drive)) > 0) { if (expiry) {
/* reset timer */ wait = expiry(drive);
hwif->timer.expires = jiffies + wait; if (wait > 0) { /* continue */
hwif->req_gen_timer = hwif->req_gen; /* reset timer */
add_timer(&hwif->timer); hwif->timer.expires = jiffies + wait;
spin_unlock_irqrestore(&hwif->lock, flags); hwif->req_gen_timer = hwif->req_gen;
return; add_timer(&hwif->timer);
} spin_unlock_irqrestore(&hwif->lock, flags);
} return;
hwif->handler = NULL;
/*
* We need to simulate a real interrupt when invoking
* the handler() function, which means we need to
* globally mask the specific IRQ:
*/
spin_unlock(&hwif->lock);
/* disable_irq_nosync ?? */
disable_irq(hwif->irq);
/* local CPU only,
* as if we were handling an interrupt */
local_irq_disable();
if (hwif->polling) {
startstop = handler(drive);
} else if (drive_is_ready(drive)) {
if (drive->waiting_for_dma)
hwif->dma_ops->dma_lost_irq(drive);
(void)ide_ack_intr(hwif);
printk(KERN_WARNING "%s: lost interrupt\n", drive->name);
startstop = handler(drive);
} else {
if (drive->waiting_for_dma) {
startstop = ide_dma_timeout_retry(drive, wait);
} else
startstop =
ide_error(drive, "irq timeout",
hwif->tp_ops->read_status(hwif));
}
spin_lock_irq(&hwif->lock);
enable_irq(hwif->irq);
if (startstop == ide_stopped) {
ide_unlock_port(hwif);
plug_device = 1;
} }
} }
hwif->handler = NULL;
/*
* We need to simulate a real interrupt when invoking
* the handler() function, which means we need to
* globally mask the specific IRQ:
*/
spin_unlock(&hwif->lock);
/* disable_irq_nosync ?? */
disable_irq(hwif->irq);
/* local CPU only, as if we were handling an interrupt */
local_irq_disable();
if (hwif->polling) {
startstop = handler(drive);
} else if (drive_is_ready(drive)) {
if (drive->waiting_for_dma)
hwif->dma_ops->dma_lost_irq(drive);
(void)ide_ack_intr(hwif);
printk(KERN_WARNING "%s: lost interrupt\n",
drive->name);
startstop = handler(drive);
} else {
if (drive->waiting_for_dma)
startstop = ide_dma_timeout_retry(drive, wait);
else
startstop = ide_error(drive, "irq timeout",
hwif->tp_ops->read_status(hwif));
}
spin_lock_irq(&hwif->lock);
enable_irq(hwif->irq);
if (startstop == ide_stopped) {
ide_unlock_port(hwif);
plug_device = 1;
}
} }
spin_unlock_irqrestore(&hwif->lock, flags); spin_unlock_irqrestore(&hwif->lock, flags);
@@ -1115,15 +1110,6 @@ irqreturn_t ide_intr (int irq, void *dev_id)
} }
drive = hwif->cur_dev; drive = hwif->cur_dev;
if (!drive) {
/*
* This should NEVER happen, and there isn't much
* we could do about it here.
*
* [Note - this can occur if the drive is hot unplugged]
*/
goto out_handled;
}
if (!drive_is_ready(drive)) if (!drive_is_ready(drive))
/* /*
@@ -1162,7 +1148,6 @@ irqreturn_t ide_intr (int irq, void *dev_id)
ide_unlock_port(hwif); ide_unlock_port(hwif);
plug_device = 1; plug_device = 1;
} }
out_handled:
irq_ret = IRQ_HANDLED; irq_ret = IRQ_HANDLED;
out: out:
spin_unlock_irqrestore(&hwif->lock, flags); spin_unlock_irqrestore(&hwif->lock, flags);