diff options
Diffstat (limited to 'drivers/ata/pata_sis.c')
-rw-r--r-- | drivers/ata/pata_sis.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index a3fbcee6fb33..7c6b58223c79 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
@@ -88,6 +88,7 @@ static int sis_port_base(struct ata_device *adev) | |||
88 | /** | 88 | /** |
89 | * sis_133_cable_detect - check for 40/80 pin | 89 | * sis_133_cable_detect - check for 40/80 pin |
90 | * @ap: Port | 90 | * @ap: Port |
91 | * @deadline: deadline jiffies for the operation | ||
91 | * | 92 | * |
92 | * Perform cable detection for the later UDMA133 capable | 93 | * Perform cable detection for the later UDMA133 capable |
93 | * SiS chipset. | 94 | * SiS chipset. |
@@ -108,6 +109,7 @@ static int sis_133_cable_detect(struct ata_port *ap) | |||
108 | /** | 109 | /** |
109 | * sis_66_cable_detect - check for 40/80 pin | 110 | * sis_66_cable_detect - check for 40/80 pin |
110 | * @ap: Port | 111 | * @ap: Port |
112 | * @deadline: deadline jiffies for the operation | ||
111 | * | 113 | * |
112 | * Perform cable detection on the UDMA66, UDMA100 and early UDMA133 | 114 | * Perform cable detection on the UDMA66, UDMA100 and early UDMA133 |
113 | * SiS IDE controllers. | 115 | * SiS IDE controllers. |
@@ -130,11 +132,12 @@ static int sis_66_cable_detect(struct ata_port *ap) | |||
130 | /** | 132 | /** |
131 | * sis_pre_reset - probe begin | 133 | * sis_pre_reset - probe begin |
132 | * @ap: ATA port | 134 | * @ap: ATA port |
135 | * @deadline: deadline jiffies for the operation | ||
133 | * | 136 | * |
134 | * Set up cable type and use generic probe init | 137 | * Set up cable type and use generic probe init |
135 | */ | 138 | */ |
136 | 139 | ||
137 | static int sis_pre_reset(struct ata_port *ap) | 140 | static int sis_old_pre_reset(struct ata_port *ap, unsigned long deadline) |
138 | { | 141 | { |
139 | static const struct pci_bits sis_enable_bits[] = { | 142 | static const struct pci_bits sis_enable_bits[] = { |
140 | { 0x4aU, 1U, 0x02UL, 0x02UL }, /* port 0 */ | 143 | { 0x4aU, 1U, 0x02UL, 0x02UL }, /* port 0 */ |
@@ -145,7 +148,8 @@ static int sis_pre_reset(struct ata_port *ap) | |||
145 | 148 | ||
146 | if (!pci_test_config_bits(pdev, &sis_enable_bits[ap->port_no])) | 149 | if (!pci_test_config_bits(pdev, &sis_enable_bits[ap->port_no])) |
147 | return -ENOENT; | 150 | return -ENOENT; |
148 | return ata_std_prereset(ap); | 151 | |
152 | return ata_std_prereset(ap, deadline); | ||
149 | } | 153 | } |
150 | 154 | ||
151 | 155 | ||