summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-03-09 09:41:19 -0500
committerJeff Garzik <jeff@garzik.org>2007-05-01 07:49:54 -0400
commit27c78b372d05e47bbd059c9bb003c6d716abff54 (patch)
tree3d6880b48557689dbe67c88cca952636a4554c5b /drivers
parent31daabda16063b64a99a526242add727601e43c3 (diff)
downloadop-kernel-dev-27c78b372d05e47bbd059c9bb003c6d716abff54.zip
op-kernel-dev-27c78b372d05e47bbd059c9bb003c6d716abff54.tar.gz
[libata reset-seq] build and merge fixes
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_artop.c3
-rw-r--r--drivers/ata/pata_marvell.c3
-rw-r--r--drivers/ata/pata_sis.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index d472894..ef51940 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -89,7 +89,8 @@ static int artop6260_pre_reset(struct ata_port *ap, unsigned long deadline)
/* 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]))
return -ENOENT;
- return ata_std_prereset(ap);
+
+ return ata_std_prereset(ap, deadline);
}
/**
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 8ab236c..837b7fe 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -53,7 +53,8 @@ static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline)
if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
(!(devices & 0x10))) /* PATA enable ? */
return -ENOENT;
- return ata_std_prereset(ap);
+
+ return ata_std_prereset(ap, deadline);
}
static int marvell_cable_detect(struct ata_port *ap)
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 7c6b582..f5838cc 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -137,7 +137,7 @@ static int sis_66_cable_detect(struct ata_port *ap)
* Set up cable type and use generic probe init
*/
-static int sis_old_pre_reset(struct ata_port *ap, unsigned long deadline)
+static int sis_pre_reset(struct ata_port *ap, unsigned long deadline)
{
static const struct pci_bits sis_enable_bits[] = {
{ 0x4aU, 1U, 0x02UL, 0x02UL }, /* port 0 */
OpenPOWER on IntegriCloud