[PATCH] ata_piix: Remove ugly layering violation

[PATCH] ata_piix: Remove ugly layering violation

[Alan Cox]

A while ago I modified the libata code so that drivers can return -ENOENT
for unknown ports not fiddle with the EH flags and print stuff directly.
Somewhere along the line ata_piix didn't get fully converted.

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc2-mm2/drivers/ata/ata_piix.c linux-2.6.21-rc2-mm2/drivers/ata/ata_piix.c
--- linux.vanilla-2.6.21-rc2-mm2/drivers/ata/ata_piix.c	2007-03-06 23:09:46.000000000 +0000
+++ linux-2.6.21-rc2-mm2/drivers/ata/ata_piix.c	2007-03-06 23:33:53.000000000 +0000
@@ -93,7 +93,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME	"ata_piix"
-#define DRV_VERSION	"2.10"
+#define DRV_VERSION	"2.10ac1"
 
 enum {
 	PIIX_IOCFG		= 0x54, /* IDE I/O configuration register */
@@ -667,14 +667,9 @@
 {
 	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 
-	if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) {
-		ata_port_printk(ap, KERN_INFO, "port disabled. ignoring.\n");
-		ap->eh_context.i.action &= ~ATA_EH_RESET_MASK;
-		return 0;
-	}
-
+	if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
+		return -ENOENT;
 	ich_pata_cbl_detect(ap);
-
 	return ata_std_prereset(ap);
 }
 

 

Re: [PATCH] ata_piix: Remove ugly layering violation

[Jeff Garzik]

Alan Cox wrote:
> A while ago I modified the libata code so that drivers can return -ENOENT
> for unknown ports not fiddle with the EH flags and print stuff directly.
> Somewhere along the line ata_piix didn't get fully converted.
> 
> Signed-off-by: Alan Cox <alan@redhat.com>
> 
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc2-mm2/drivers/ata/ata_piix.c linux-2.6.21-rc2-mm2/drivers/ata/ata_piix.c
> --- linux.vanilla-2.6.21-rc2-mm2/drivers/ata/ata_piix.c	2007-03-06 23:09:46.000000000 +0000
> +++ linux-2.6.21-rc2-mm2/drivers/ata/ata_piix.c	2007-03-06 23:33:53.000000000 +0000

will apply this in the next few hours


>  #define DRV_NAME	"ata_piix"
> -#define DRV_VERSION	"2.10"
> +#define DRV_VERSION	"2.10ac1"

please don't add "acX" suffixes.  that's like spraypainting "alan wuz 
here" graphitti ;-)  Just increment to the next numeric version, like 
you do with the other PATA drivers.

	Jeff

Re: [PATCH] ata_piix: Remove ugly layering violation

[Alan Cox]

> please don't add "acX" suffixes.  that's like spraypainting "alan wuz 
> here" graphitti ;-)  Just increment to the next numeric version, like 
> you do with the other PATA drivers.

Ok - I just didn't want to clash with other allocated numbers or vendor
ones, so I've always taken acX onto stuff.

Re: [PATCH] ata_piix: Remove ugly layering violation

[Jeff Garzik]

Alan Cox wrote:
> A while ago I modified the libata code so that drivers can return -ENOENT
> for unknown ports not fiddle with the EH flags and print stuff directly.
> Somewhere along the line ata_piix didn't get fully converted.
> 
> Signed-off-by: Alan Cox <alan@redhat.com>

applied to #upstream-fixes (and I forgot to fix the version number, sigh)