[PATCH] libata-eh: Remove layering violation and duplication when handling absent ports

This removes the layering violation where drivers have to fiddle
directly with EH flags. Instead we now recognize -ENOENT means "no port"
and do the handling in the core code.

This also removes an instance of a call to disable the port, and an
identical printk from each driver doing this. Even better - future rule
changes will be in one place only.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 3fa80f09f2ae..02b2b2787d9b 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1515,7 +1515,11 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
         if (prereset) {
                 rc = prereset(ap);
                 if (rc) {
-                        ata_port_printk(ap, KERN_ERR,
+                        if (rc == -ENOENT) {
+                                ata_port_printk(ap, KERN_DEBUG, "port disabled. ignoring.\n");
+                                ap->eh_context.i.action &= ~ATA_EH_RESET_MASK;
+                        } else
+                                ata_port_printk(ap, KERN_ERR,
                                         "prereset failed (errno=%d)\n", rc);
                         return rc;
                 }