diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-09-26 17:53:38 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:34:27 -0400 |
| commit | c961922b73dab429a759f560952fd4c3f60bd6b3 (patch) | |
| tree | cbd6d6424d508fd208ae9992c1cf11b3b8a91fb1 /drivers/ata/pata_via.c | |
| parent | 4735ebedf37731160e3d3efc9fc9d4939c66fefa (diff) | |
[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>
Diffstat (limited to 'drivers/ata/pata_via.c')
| -rw-r--r-- | drivers/ata/pata_via.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 1b2ff133b16..0e8b1303acd 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c @@ -60,7 +60,7 @@ #include <linux/libata.h> #define DRV_NAME "pata_via" -#define DRV_VERSION "0.1.13" +#define DRV_VERSION "0.1.14" /* * The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx @@ -155,11 +155,8 @@ static int via_pre_reset(struct ata_port *ap) struct pci_dev *pdev = to_pci_dev(ap->host->dev); - if (!pci_test_config_bits(pdev, &via_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, &via_enable_bits[ap->port_no])) + return -ENOENT; } if ((config->flags & VIA_UDMA) >= VIA_UDMA_66) |