diff options
Diffstat (limited to 'drivers/ata/pata_artop.c')
-rw-r--r-- | drivers/ata/pata_artop.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c index 00e9ec342db0..ef51940c3adb 100644 --- a/drivers/ata/pata_artop.c +++ b/drivers/ata/pata_artop.c | |||
@@ -39,7 +39,7 @@ | |||
39 | 39 | ||
40 | static int clock = 0; | 40 | static int clock = 0; |
41 | 41 | ||
42 | static int artop6210_pre_reset(struct ata_port *ap) | 42 | static int artop6210_pre_reset(struct ata_port *ap, unsigned long deadline) |
43 | { | 43 | { |
44 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 44 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
45 | const struct pci_bits artop_enable_bits[] = { | 45 | const struct pci_bits artop_enable_bits[] = { |
@@ -49,7 +49,8 @@ static int artop6210_pre_reset(struct ata_port *ap) | |||
49 | 49 | ||
50 | if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no])) | 50 | if (!pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no])) |
51 | return -ENOENT; | 51 | return -ENOENT; |
52 | return ata_std_prereset(ap); | 52 | |
53 | return ata_std_prereset(ap, deadline); | ||
53 | } | 54 | } |
54 | 55 | ||
55 | /** | 56 | /** |
@@ -70,12 +71,13 @@ static void artop6210_error_handler(struct ata_port *ap) | |||
70 | /** | 71 | /** |
71 | * artop6260_pre_reset - check for 40/80 pin | 72 | * artop6260_pre_reset - check for 40/80 pin |
72 | * @ap: Port | 73 | * @ap: Port |
74 | * @deadline: deadline jiffies for the operation | ||
73 | * | 75 | * |
74 | * The ARTOP hardware reports the cable detect bits in register 0x49. | 76 | * The ARTOP hardware reports the cable detect bits in register 0x49. |
75 | * Nothing complicated needed here. | 77 | * Nothing complicated needed here. |
76 | */ | 78 | */ |
77 | 79 | ||
78 | static int artop6260_pre_reset(struct ata_port *ap) | 80 | static int artop6260_pre_reset(struct ata_port *ap, unsigned long deadline) |
79 | { | 81 | { |
80 | static const struct pci_bits artop_enable_bits[] = { | 82 | static const struct pci_bits artop_enable_bits[] = { |
81 | { 0x4AU, 1U, 0x02UL, 0x02UL }, /* port 0 */ | 83 | { 0x4AU, 1U, 0x02UL, 0x02UL }, /* port 0 */ |
@@ -87,7 +89,8 @@ static int artop6260_pre_reset(struct ata_port *ap) | |||
87 | /* 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) */ |
88 | 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])) |
89 | return -ENOENT; | 91 | return -ENOENT; |
90 | return ata_std_prereset(ap); | 92 | |
93 | return ata_std_prereset(ap, deadline); | ||
91 | } | 94 | } |
92 | 95 | ||
93 | /** | 96 | /** |