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, 2 insertions, 7 deletions

diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index 303ca7e82408..3001109352ea 100644
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -654,9 +654,6 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance)
                 ap = host->ports[i];
                 ocd = ap->dev->platform_data;
 
-                if (ap->flags & ATA_FLAG_DISABLED)
-                        continue;
-
                 ocd = ap->dev->platform_data;
                 cf_port = ap->private_data;
                 dma_int.u64 =
@@ -666,8 +663,7 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance)
 
                 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)) {
                         if (dma_int.s.done && !dma_cfg.s.en) {
                                 if (!sg_is_last(qc->cursg)) {
                                         qc->cursg = sg_next(qc->cursg);
@@ -737,8 +733,7 @@ static void octeon_cf_delayed_finish(struct work_struct *work)
                 goto out;
         }
         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))
                 octeon_cf_dma_finished(ap, qc);
 out:
         spin_unlock_irqrestore(&host->lock, flags);