|
@@ -1770,18 +1770,15 @@ irqreturn_t ata_sff_interrupt(int irq, void *dev_instance)
|
|
|
spin_lock_irqsave(&host->lock, flags);
|
|
|
|
|
|
for (i = 0; i < host->n_ports; i++) {
|
|
|
- struct ata_port *ap;
|
|
|
+ struct ata_port *ap = host->ports[i];
|
|
|
+ struct ata_queued_cmd *qc;
|
|
|
|
|
|
- ap = host->ports[i];
|
|
|
- if (ap &&
|
|
|
- !(ap->flags & ATA_FLAG_DISABLED)) {
|
|
|
- struct ata_queued_cmd *qc;
|
|
|
+ if (unlikely(ap->flags & ATA_FLAG_DISABLED))
|
|
|
+ continue;
|
|
|
|
|
|
- qc = ata_qc_from_tag(ap, ap->link.active_tag);
|
|
|
- if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)) &&
|
|
|
- (qc->flags & ATA_QCFLAG_ACTIVE))
|
|
|
- handled |= ata_sff_host_intr(ap, qc);
|
|
|
- }
|
|
|
+ qc = ata_qc_from_tag(ap, ap->link.active_tag);
|
|
|
+ if (qc && !(qc->tf.flags & ATA_TFLAG_POLLING))
|
|
|
+ handled |= ata_sff_host_intr(ap, qc);
|
|
|
}
|
|
|
|
|
|
spin_unlock_irqrestore(&host->lock, flags);
|