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

ide: unify ide_intr()'s exit points

Browse Source 
Just a preparation for future changes.

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
2008-12-29 20:27:29 +01:00
parent 0e63a588fc
commit 3e0e29f737
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1363,14 +1363,13 @@ irqreturn_t ide_intr (int irq, void *dev_id)
ide_drive_t *drive; ide_drive_t *drive;
ide_handler_t *handler; ide_handler_t *handler;
ide_startstop_t startstop; ide_startstop_t startstop;
irqreturn_t irq_ret = IRQ_NONE;
spin_lock_irqsave(&ide_lock, flags); spin_lock_irqsave(&ide_lock, flags);
hwif = hwgroup->hwif; hwif = hwgroup->hwif;
if (!ide_ack_intr(hwif)) { if (!ide_ack_intr(hwif))
spin_unlock_irqrestore(&ide_lock, flags); goto out;
return IRQ_NONE;
}
if ((handler = hwgroup->handler) == NULL || hwgroup->polling) { if ((handler = hwgroup->handler) == NULL || hwgroup->polling) {
/* /*
@@ -1406,9 +1405,9 @@ irqreturn_t ide_intr (int irq, void *dev_id)
(void)hwif->tp_ops->read_status(hwif); (void)hwif->tp_ops->read_status(hwif);
#endif /* CONFIG_BLK_DEV_IDEPCI */ #endif /* CONFIG_BLK_DEV_IDEPCI */
} }
spin_unlock_irqrestore(&ide_lock, flags); goto out;
return IRQ_NONE;
} }
drive = hwgroup->drive; drive = hwgroup->drive;
if (!drive) { if (!drive) {
/* /*
@@ -1417,10 +1416,10 @@ irqreturn_t ide_intr (int irq, void *dev_id)
* *
* [Note - this can occur if the drive is hot unplugged] * [Note - this can occur if the drive is hot unplugged]
*/ */
spin_unlock_irqrestore(&ide_lock, flags); goto out_handled;
return IRQ_HANDLED;
} }
if (!drive_is_ready(drive)) {
if (!drive_is_ready(drive))
/* /*
* This happens regularly when we share a PCI IRQ with * This happens regularly when we share a PCI IRQ with
* another device. Unfortunately, it can also happen * another device. Unfortunately, it can also happen
@@ -1428,9 +1427,8 @@ irqreturn_t ide_intr (int irq, void *dev_id)
* their status register is up to date. Hopefully we have * their status register is up to date. Hopefully we have
* enough advance overhead that the latter isn't a problem. * enough advance overhead that the latter isn't a problem.
*/ */
spin_unlock_irqrestore(&ide_lock, flags); goto out;
return IRQ_NONE;
}
if (!hwgroup->busy) { if (!hwgroup->busy) {
hwgroup->busy = 1; /* paranoia */ hwgroup->busy = 1; /* paranoia */
printk(KERN_ERR "%s: ide_intr: hwgroup->busy was 0 ??\n", drive->name); printk(KERN_ERR "%s: ide_intr: hwgroup->busy was 0 ??\n", drive->name);
@@ -1467,8 +1465,11 @@ irqreturn_t ide_intr (int irq, void *dev_id)
"on exit\n", drive->name); "on exit\n", drive->name);
} }
} }
out_handled:
irq_ret = IRQ_HANDLED;
out:
spin_unlock_irqrestore(&ide_lock, flags); spin_unlock_irqrestore(&ide_lock, flags);
return IRQ_HANDLED; return irq_ret;
} }
/** /**