[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, 7 insertions, 11 deletions

diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index d6ef3bf1bac7..0f3b49176dc1 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -28,7 +28,7 @@
 #include <linux/ata.h>
 
 #define DRV_NAME        "pata_artop"
-#define DRV_VERSION     "0.4.1"
+#define DRV_VERSION     "0.4.2"
 
 /*
  *      The ARTOP has 33 Mhz and "over clocked" timing tables. Until we
@@ -47,11 +47,9 @@ static int artop6210_pre_reset(struct ata_port *ap)
                 { 0x4AU, 1U, 0x04UL, 0x04UL },  /* port 1 */
         };
 
-        if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no])) {
-                ata_port_disable(ap);
-                printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);
-                return 0;
-        }
+        if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
+                return -ENOENT;
+
         ap->cbl = ATA_CBL_PATA40;
         return ata_std_prereset(ap);
 }
@@ -90,11 +88,9 @@ static int artop6260_pre_reset(struct ata_port *ap)
         u8 tmp;
 
         /* Odd numbered device ids are the units with enable bits (the -R cards) */
-        if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no])) {
-                ata_port_disable(ap);
-                printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);
-                return 0;
-        }
+        if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
+                return -ENOENT;
+
         pci_read_config_byte(pdev, 0x49, &tmp);
         if (tmp & (1 >> ap->port_no))
                 ap->cbl = ATA_CBL_PATA40;