diff options
Diffstat (limited to 'drivers/ata/pata_efar.c')
-rw-r--r-- | drivers/ata/pata_efar.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c index c8ba59c56114..043dcd35106c 100644 --- a/drivers/ata/pata_efar.c +++ b/drivers/ata/pata_efar.c | |||
@@ -26,25 +26,26 @@ | |||
26 | 26 | ||
27 | /** | 27 | /** |
28 | * efar_pre_reset - Enable bits | 28 | * efar_pre_reset - Enable bits |
29 | * @ap: Port | 29 | * @link: ATA link |
30 | * @deadline: deadline jiffies for the operation | 30 | * @deadline: deadline jiffies for the operation |
31 | * | 31 | * |
32 | * Perform cable detection for the EFAR ATA interface. This is | 32 | * Perform cable detection for the EFAR ATA interface. This is |
33 | * different to the PIIX arrangement | 33 | * different to the PIIX arrangement |
34 | */ | 34 | */ |
35 | 35 | ||
36 | static int efar_pre_reset(struct ata_port *ap, unsigned long deadline) | 36 | static int efar_pre_reset(struct ata_link *link, unsigned long deadline) |
37 | { | 37 | { |
38 | static const struct pci_bits efar_enable_bits[] = { | 38 | static const struct pci_bits efar_enable_bits[] = { |
39 | { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ | 39 | { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ |
40 | { 0x43U, 1U, 0x80UL, 0x80UL }, /* port 1 */ | 40 | { 0x43U, 1U, 0x80UL, 0x80UL }, /* port 1 */ |
41 | }; | 41 | }; |
42 | struct ata_port *ap = link->ap; | ||
42 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 43 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
43 | 44 | ||
44 | if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no])) | 45 | if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no])) |
45 | return -ENOENT; | 46 | return -ENOENT; |
46 | 47 | ||
47 | return ata_std_prereset(ap, deadline); | 48 | return ata_std_prereset(link, deadline); |
48 | } | 49 | } |
49 | 50 | ||
50 | /** | 51 | /** |
@@ -250,7 +251,6 @@ static struct scsi_host_template efar_sht = { | |||
250 | }; | 251 | }; |
251 | 252 | ||
252 | static const struct ata_port_operations efar_ops = { | 253 | static const struct ata_port_operations efar_ops = { |
253 | .port_disable = ata_port_disable, | ||
254 | .set_piomode = efar_set_piomode, | 254 | .set_piomode = efar_set_piomode, |
255 | .set_dmamode = efar_set_dmamode, | 255 | .set_dmamode = efar_set_dmamode, |
256 | .mode_filter = ata_pci_default_filter, | 256 | .mode_filter = ata_pci_default_filter, |
@@ -278,9 +278,8 @@ static const struct ata_port_operations efar_ops = { | |||
278 | .irq_handler = ata_interrupt, | 278 | .irq_handler = ata_interrupt, |
279 | .irq_clear = ata_bmdma_irq_clear, | 279 | .irq_clear = ata_bmdma_irq_clear, |
280 | .irq_on = ata_irq_on, | 280 | .irq_on = ata_irq_on, |
281 | .irq_ack = ata_irq_ack, | ||
282 | 281 | ||
283 | .port_start = ata_port_start, | 282 | .port_start = ata_sff_port_start, |
284 | }; | 283 | }; |
285 | 284 | ||
286 | 285 | ||