aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 d472894a983b..ef51940c3adb 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)
89 /* Odd numbered device ids are the units with enable bits (the -R cards) */ 89 /* Odd numbered device ids are the units with enable bits (the -R cards) */
90 if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no])) 90 if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))
91 return -ENOENT; 91 return -ENOENT;
92 return ata_std_prereset(ap); 92
93 return ata_std_prereset(ap, deadline);
93} 94}
94 95
95/** 96/**
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 8ab236c54823..837b7fe77dc7 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)
53 if ((pdev->device == 0x6145) && (ap->port_no == 0) && 53 if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
54 (!(devices & 0x10))) /* PATA enable ? */ 54 (!(devices & 0x10))) /* PATA enable ? */
55 return -ENOENT; 55 return -ENOENT;
56 return ata_std_prereset(ap); 56
57 return ata_std_prereset(ap, deadline);
57} 58}
58 59
59static int marvell_cable_detect(struct ata_port *ap) 60static int marvell_cable_detect(struct ata_port *ap)
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 7c6b58223c79..f5838cc11728 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)
137 * Set up cable type and use generic probe init 137 * Set up cable type and use generic probe init
138 */ 138 */
139 139
140static int sis_old_pre_reset(struct ata_port *ap, unsigned long deadline) 140static int sis_pre_reset(struct ata_port *ap, unsigned long deadline)
141{ 141{
142 static const struct pci_bits sis_enable_bits[] = { 142 static const struct pci_bits sis_enable_bits[] = {
143 { 0x4aU, 1U, 0x02UL, 0x02UL }, /* port 0 */ 143 { 0x4aU, 1U, 0x02UL, 0x02UL }, /* port 0 */