diff options
Diffstat (limited to 'drivers/ata/pata_triflex.c')
-rw-r--r-- | drivers/ata/pata_triflex.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c index af21f443db6e..403eafcffe12 100644 --- a/drivers/ata/pata_triflex.c +++ b/drivers/ata/pata_triflex.c | |||
@@ -47,25 +47,26 @@ | |||
47 | 47 | ||
48 | /** | 48 | /** |
49 | * triflex_prereset - probe begin | 49 | * triflex_prereset - probe begin |
50 | * @ap: ATA port | 50 | * @link: ATA link |
51 | * @deadline: deadline jiffies for the operation | 51 | * @deadline: deadline jiffies for the operation |
52 | * | 52 | * |
53 | * Set up cable type and use generic probe init | 53 | * Set up cable type and use generic probe init |
54 | */ | 54 | */ |
55 | 55 | ||
56 | static int triflex_prereset(struct ata_port *ap, unsigned long deadline) | 56 | static int triflex_prereset(struct ata_link *link, unsigned long deadline) |
57 | { | 57 | { |
58 | static const struct pci_bits triflex_enable_bits[] = { | 58 | static const struct pci_bits triflex_enable_bits[] = { |
59 | { 0x80, 1, 0x01, 0x01 }, | 59 | { 0x80, 1, 0x01, 0x01 }, |
60 | { 0x80, 1, 0x02, 0x02 } | 60 | { 0x80, 1, 0x02, 0x02 } |
61 | }; | 61 | }; |
62 | 62 | ||
63 | struct ata_port *ap = link->ap; | ||
63 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 64 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
64 | 65 | ||
65 | if (!pci_test_config_bits(pdev, &triflex_enable_bits[ap->port_no])) | 66 | if (!pci_test_config_bits(pdev, &triflex_enable_bits[ap->port_no])) |
66 | return -ENOENT; | 67 | return -ENOENT; |
67 | 68 | ||
68 | return ata_std_prereset(ap, deadline); | 69 | return ata_std_prereset(link, deadline); |
69 | } | 70 | } |
70 | 71 | ||
71 | 72 | ||
@@ -197,7 +198,6 @@ static struct scsi_host_template triflex_sht = { | |||
197 | }; | 198 | }; |
198 | 199 | ||
199 | static struct ata_port_operations triflex_port_ops = { | 200 | static struct ata_port_operations triflex_port_ops = { |
200 | .port_disable = ata_port_disable, | ||
201 | .set_piomode = triflex_set_piomode, | 201 | .set_piomode = triflex_set_piomode, |
202 | .mode_filter = ata_pci_default_filter, | 202 | .mode_filter = ata_pci_default_filter, |
203 | 203 | ||
@@ -226,9 +226,8 @@ static struct ata_port_operations triflex_port_ops = { | |||
226 | .irq_handler = ata_interrupt, | 226 | .irq_handler = ata_interrupt, |
227 | .irq_clear = ata_bmdma_irq_clear, | 227 | .irq_clear = ata_bmdma_irq_clear, |
228 | .irq_on = ata_irq_on, | 228 | .irq_on = ata_irq_on, |
229 | .irq_ack = ata_irq_ack, | ||
230 | 229 | ||
231 | .port_start = ata_port_start, | 230 | .port_start = ata_sff_port_start, |
232 | }; | 231 | }; |
233 | 232 | ||
234 | static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 233 | static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id) |