diff options
Diffstat (limited to 'drivers/ata/pata_hpt37x.c')
-rw-r--r-- | drivers/ata/pata_hpt37x.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c index 41d831296347..1614e8c822a4 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c | |||
@@ -307,11 +307,12 @@ static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask) | |||
307 | /** | 307 | /** |
308 | * hpt37x_pre_reset - reset the hpt37x bus | 308 | * hpt37x_pre_reset - reset the hpt37x bus |
309 | * @ap: ATA port to reset | 309 | * @ap: ATA port to reset |
310 | * @deadline: deadline jiffies for the operation | ||
310 | * | 311 | * |
311 | * Perform the initial reset handling for the 370/372 and 374 func 0 | 312 | * Perform the initial reset handling for the 370/372 and 374 func 0 |
312 | */ | 313 | */ |
313 | 314 | ||
314 | static int hpt37x_pre_reset(struct ata_port *ap) | 315 | static int hpt37x_pre_reset(struct ata_port *ap, unsigned long deadline) |
315 | { | 316 | { |
316 | u8 scr2, ata66; | 317 | u8 scr2, ata66; |
317 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 318 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
@@ -338,7 +339,7 @@ static int hpt37x_pre_reset(struct ata_port *ap) | |||
338 | pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); | 339 | pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); |
339 | udelay(100); | 340 | udelay(100); |
340 | 341 | ||
341 | return ata_std_prereset(ap); | 342 | return ata_std_prereset(ap, deadline); |
342 | } | 343 | } |
343 | 344 | ||
344 | /** | 345 | /** |
@@ -353,7 +354,7 @@ static void hpt37x_error_handler(struct ata_port *ap) | |||
353 | ata_bmdma_drive_eh(ap, hpt37x_pre_reset, ata_std_softreset, NULL, ata_std_postreset); | 354 | ata_bmdma_drive_eh(ap, hpt37x_pre_reset, ata_std_softreset, NULL, ata_std_postreset); |
354 | } | 355 | } |
355 | 356 | ||
356 | static int hpt374_pre_reset(struct ata_port *ap) | 357 | static int hpt374_pre_reset(struct ata_port *ap, unsigned long deadline) |
357 | { | 358 | { |
358 | static const struct pci_bits hpt37x_enable_bits[] = { | 359 | static const struct pci_bits hpt37x_enable_bits[] = { |
359 | { 0x50, 1, 0x04, 0x04 }, | 360 | { 0x50, 1, 0x04, 0x04 }, |
@@ -388,7 +389,7 @@ static int hpt374_pre_reset(struct ata_port *ap) | |||
388 | pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); | 389 | pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); |
389 | udelay(100); | 390 | udelay(100); |
390 | 391 | ||
391 | return ata_std_prereset(ap); | 392 | return ata_std_prereset(ap, deadline); |
392 | } | 393 | } |
393 | 394 | ||
394 | /** | 395 | /** |