diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-03-07 16:13:07 +0000 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-03-09 08:41:15 -0500 |
| commit | 9a2eb709256cd591119edc2809b4fcac7cb8eb6c (patch) | |
| tree | 86414575b91a05c61cf8f81956ac7c5a739713f2 /drivers/ata | |
| parent | d0035aef390194df1433f436038416d2c5b0fc0e (diff) | |
| download | op-kernel-dev-9a2eb709256cd591119edc2809b4fcac7cb8eb6c.zip op-kernel-dev-9a2eb709256cd591119edc2809b4fcac7cb8eb6c.tar.gz | |
ata_piix: Remove ugly layering violation
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>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ata_piix.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index dc42ba1..b952c58 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -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 @@ static int ich_pata_prereset(struct ata_port *ap) { 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); } |
