diff options
Diffstat (limited to 'drivers/ata/pata_amd.c')
-rw-r--r-- | drivers/ata/pata_amd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c index 536ee892ab72..67c7e87dec04 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c | |||
@@ -121,12 +121,13 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse | |||
121 | /** | 121 | /** |
122 | * amd_probe_init - perform reset handling | 122 | * amd_probe_init - perform reset handling |
123 | * @ap: ATA port | 123 | * @ap: ATA port |
124 | * @deadline: deadline jiffies for the operation | ||
124 | * | 125 | * |
125 | * Reset sequence checking enable bits to see which ports are | 126 | * Reset sequence checking enable bits to see which ports are |
126 | * active. | 127 | * active. |
127 | */ | 128 | */ |
128 | 129 | ||
129 | static int amd_pre_reset(struct ata_port *ap) | 130 | static int amd_pre_reset(struct ata_port *ap, unsigned long deadline) |
130 | { | 131 | { |
131 | static const struct pci_bits amd_enable_bits[] = { | 132 | static const struct pci_bits amd_enable_bits[] = { |
132 | { 0x40, 1, 0x02, 0x02 }, | 133 | { 0x40, 1, 0x02, 0x02 }, |
@@ -138,8 +139,7 @@ static int amd_pre_reset(struct ata_port *ap) | |||
138 | if (!pci_test_config_bits(pdev, &amd_enable_bits[ap->port_no])) | 139 | if (!pci_test_config_bits(pdev, &amd_enable_bits[ap->port_no])) |
139 | return -ENOENT; | 140 | return -ENOENT; |
140 | 141 | ||
141 | return ata_std_prereset(ap); | 142 | return ata_std_prereset(ap, deadline); |
142 | |||
143 | } | 143 | } |
144 | 144 | ||
145 | static void amd_error_handler(struct ata_port *ap) | 145 | static void amd_error_handler(struct ata_port *ap) |
@@ -227,7 +227,8 @@ static void amd133_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
227 | * space for us. | 227 | * space for us. |
228 | */ | 228 | */ |
229 | 229 | ||
230 | static int nv_pre_reset(struct ata_port *ap) { | 230 | static int nv_pre_reset(struct ata_port *ap, unsigned long deadline) |
231 | { | ||
231 | static const struct pci_bits nv_enable_bits[] = { | 232 | static const struct pci_bits nv_enable_bits[] = { |
232 | { 0x50, 1, 0x02, 0x02 }, | 233 | { 0x50, 1, 0x02, 0x02 }, |
233 | { 0x50, 1, 0x01, 0x01 } | 234 | { 0x50, 1, 0x01, 0x01 } |
@@ -238,7 +239,7 @@ static int nv_pre_reset(struct ata_port *ap) { | |||
238 | if (!pci_test_config_bits(pdev, &nv_enable_bits[ap->port_no])) | 239 | if (!pci_test_config_bits(pdev, &nv_enable_bits[ap->port_no])) |
239 | return -ENOENT; | 240 | return -ENOENT; |
240 | 241 | ||
241 | return ata_std_prereset(ap); | 242 | return ata_std_prereset(ap, deadline); |
242 | } | 243 | } |
243 | 244 | ||
244 | static void nv_error_handler(struct ata_port *ap) | 245 | static void nv_error_handler(struct ata_port *ap) |