libata: cleanup ata_sff_interrupt() (d88ec2e5) · Commits · 戴 / test

host->ports[i] is never NULL if i < host->n_ports and non-NULL return from ata_qc_from_tag() guarantees that the returned qc is active. Drop unnecessary tests. Superflous () dropped as suggested by Sergei. Signed-off-by:

Tejun Heo <tj@kernel.org> Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by:

Jeff Garzik <jgarzik@redhat.com>

drivers/ata/libata-sff.c

+7 −10

Original line number	Diff line number	Diff line
		@@ -1770,19 +1770,16 @@ 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;

		ap = host->ports[i];
		if (ap &&
		!(ap->flags & ATA_FLAG_DISABLED)) {
		struct ata_port *ap = host->ports[i];
		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))
		if (qc && !(qc->tf.flags & ATA_TFLAG_POLLING))
		handled \|= ata_sff_host_intr(ap, qc);
		}
		}

		spin_unlock_irqrestore(&host->lock, flags);

Admin message