libata: kill ATA_FLAG_DISABLED

ATA_FLAG_DISABLED is only used by drivers which don't use
->error_handler framework and is largely broken.  Its only meaningful
function is to make irq handlers skip processing if the flag is set,
which is largely useless and even harmful as it makes those ports more
likely to cause IRQ storms.

Kill ATA_FLAG_DISABLED and makes the callers disable attached devices
instead.  ata_port_probe() and ata_port_disable() which manipulate the
flag are also killed.

This simplifies condition check in IRQ handlers.  While updating IRQ
handlers, remove ap NULL check as libata guarantees consecutive port
allocation (unoccupied ports are initialized with dummies) and
long-obsolete ATA_QCFLAG_ACTIVE check (checked by ata_qc_from_tag()).

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 37 insertions, 42 deletions

diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 92ba45e6689b..febc6e748420 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -404,26 +404,24 @@ static inline unsigned int qs_intr_pkt(struct ata_host *host)
                         u8 sHST = sff1 & 0x3f;  /* host status */
                         unsigned int port_no = (sff1 >> 8) & 0x03;
                         struct ata_port *ap = host->ports[port_no];
+                        struct qs_port_priv *pp = ap->private_data;
+                        struct ata_queued_cmd *qc;
 
                         DPRINTK("SFF=%08x%08x: sCHAN=%u sHST=%d sDST=%02x\n",
                                         sff1, sff0, port_no, sHST, sDST);
                         handled = 1;
-                        if (ap && !(ap->flags & ATA_FLAG_DISABLED)) {
-                                struct ata_queued_cmd *qc;
-                                struct qs_port_priv *pp = ap->private_data;
-                                if (!pp || pp->state != qs_state_pkt)
-                                        continue;
-                                qc = ata_qc_from_tag(ap, ap->link.active_tag);
-                                if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
-                                        switch (sHST) {
-                                        case 0: /* successful CPB */
-                                        case 3: /* device error */
-                                                qs_enter_reg_mode(qc->ap);
-                                                qs_do_or_die(qc, sDST);
-                                                break;
-                                        default:
-                                                break;
-                                        }
+                        if (!pp || pp->state != qs_state_pkt)
+                                continue;
+                        qc = ata_qc_from_tag(ap, ap->link.active_tag);
+                        if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
+                                switch (sHST) {
+                                case 0: /* successful CPB */
+                                case 3: /* device error */
+                                        qs_enter_reg_mode(qc->ap);
+                                        qs_do_or_die(qc, sDST);
+                                        break;
+                                default:
+                                        break;
                                 }
                         }
                 }
@@ -436,33 +434,30 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host)
         unsigned int handled = 0, port_no;
 
         for (port_no = 0; port_no < host->n_ports; ++port_no) {
-                struct ata_port *ap;
-                ap = host->ports[port_no];
-                if (ap &&
-                    !(ap->flags & ATA_FLAG_DISABLED)) {
-                        struct ata_queued_cmd *qc;
-                        struct qs_port_priv *pp;
-                        qc = ata_qc_from_tag(ap, ap->link.active_tag);
-                        if (!qc || !(qc->flags & ATA_QCFLAG_ACTIVE)) {
-                                /*
-                                 * The qstor hardware generates spurious
-                                 * interrupts from time to time when switching
-                                 * in and out of packet mode.
-                                 * There's no obvious way to know if we're
-                                 * here now due to that, so just ack the irq
-                                 * and pretend we knew it was ours.. (ugh).
-                                 * This does not affect packet mode.
-                                 */
-                                ata_sff_check_status(ap);
-                                handled = 1;
-                                continue;
-                        }
-                        pp = ap->private_data;
-                        if (!pp || pp->state != qs_state_mmio)
-                                continue;
-                        if (!(qc->tf.flags & ATA_TFLAG_POLLING))
-                                handled |= ata_sff_host_intr(ap, qc);
+                struct ata_port *ap = host->ports[port_no];
+                struct qs_port_priv *pp = ap->private_data;
+                struct ata_queued_cmd *qc;
+
+                qc = ata_qc_from_tag(ap, ap->link.active_tag);
+                if (!qc) {
+                        /*
+                         * The qstor hardware generates spurious
+                         * interrupts from time to time when switching
+                         * in and out of packet mode.  There's no
+                         * obvious way to know if we're here now due
+                         * to that, so just ack the irq and pretend we
+                         * knew it was ours.. (ugh).  This does not
+                         * affect packet mode.
+                         */
+                        ata_sff_check_status(ap);
+                        handled = 1;
+                        continue;
                 }
+
+                if (!pp || pp->state != qs_state_mmio)
+                        continue;
+                if (!(qc->tf.flags & ATA_TFLAG_POLLING))
+                        handled |= ata_sff_host_intr(ap, qc);
         }
         return handled;
 }