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, 30 insertions, 36 deletions

diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 5904cfdb8dbe..ed18d8b42c52 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -442,8 +442,6 @@ static inline unsigned int adma_intr_pkt(struct ata_host *host)
                         continue;
                 handled = 1;
                 adma_enter_reg_mode(ap);
-                if (ap->flags & ATA_FLAG_DISABLED)
-                        continue;
                 pp = ap->private_data;
                 if (!pp || pp->state != adma_state_pkt)
                         continue;
@@ -484,42 +482,38 @@ static inline unsigned int adma_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 adma_port_priv *pp = ap->private_data;
-                        if (!pp || pp->state != adma_state_mmio)
+                struct ata_port *ap = host->ports[port_no];
+                struct adma_port_priv *pp = ap->private_data;
+                struct ata_queued_cmd *qc;
+
+                if (!pp || pp->state != adma_state_mmio)
+                        continue;
+                qc = ata_qc_from_tag(ap, ap->link.active_tag);
+                if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
+
+                        /* check main status, clearing INTRQ */
+                        u8 status = ata_sff_check_status(ap);
+                        if ((status & ATA_BUSY))
                                 continue;
-                        qc = ata_qc_from_tag(ap, ap->link.active_tag);
-                        if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
-
-                                /* check main status, clearing INTRQ */
-                                u8 status = ata_sff_check_status(ap);
-                                if ((status & ATA_BUSY))
-                                        continue;
-                                DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
-                                        ap->print_id, qc->tf.protocol, status);
-
-                                /* complete taskfile transaction */
-                                pp->state = adma_state_idle;
-                                qc->err_mask |= ac_err_mask(status);
-                                if (!qc->err_mask)
-                                        ata_qc_complete(qc);
-                                else {
-                                        struct ata_eh_info *ehi =
-                                                &ap->link.eh_info;
-                                        ata_ehi_clear_desc(ehi);
-                                        ata_ehi_push_desc(ehi,
-                                                "status 0x%02X", status);
-
-                                        if (qc->err_mask == AC_ERR_DEV)
-                                                ata_port_abort(ap);
-                                        else
-                                                ata_port_freeze(ap);
-                                }
-                                handled = 1;
+                        DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
+                                ap->print_id, qc->tf.protocol, status);
+
+                        /* complete taskfile transaction */
+                        pp->state = adma_state_idle;
+                        qc->err_mask |= ac_err_mask(status);
+                        if (!qc->err_mask)
+                                ata_qc_complete(qc);
+                        else {
+                                struct ata_eh_info *ehi = &ap->link.eh_info;
+                                ata_ehi_clear_desc(ehi);
+                                ata_ehi_push_desc(ehi, "status 0x%02X", status);
+
+                                if (qc->err_mask == AC_ERR_DEV)
+                                        ata_port_abort(ap);
+                                else
+                                        ata_port_freeze(ap);
                         }
+                        handled = 1;
                 }
         }
         return handled;