diff options
Diffstat (limited to 'drivers/ata/pata_ns87410.c')
-rw-r--r-- | drivers/ata/pata_ns87410.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c index 2f5d714ebfc4..6e8e55745b7b 100644 --- a/drivers/ata/pata_ns87410.c +++ b/drivers/ata/pata_ns87410.c | |||
@@ -32,14 +32,15 @@ | |||
32 | 32 | ||
33 | /** | 33 | /** |
34 | * ns87410_pre_reset - probe begin | 34 | * ns87410_pre_reset - probe begin |
35 | * @ap: ATA port | 35 | * @link: ATA link |
36 | * @deadline: deadline jiffies for the operation | 36 | * @deadline: deadline jiffies for the operation |
37 | * | 37 | * |
38 | * Check enabled ports | 38 | * Check enabled ports |
39 | */ | 39 | */ |
40 | 40 | ||
41 | static int ns87410_pre_reset(struct ata_port *ap, unsigned long deadline) | 41 | static int ns87410_pre_reset(struct ata_link *link, unsigned long deadline) |
42 | { | 42 | { |
43 | struct ata_port *ap = link->ap; | ||
43 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 44 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
44 | static const struct pci_bits ns87410_enable_bits[] = { | 45 | static const struct pci_bits ns87410_enable_bits[] = { |
45 | { 0x43, 1, 0x08, 0x08 }, | 46 | { 0x43, 1, 0x08, 0x08 }, |
@@ -49,7 +50,7 @@ static int ns87410_pre_reset(struct ata_port *ap, unsigned long deadline) | |||
49 | if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no])) | 50 | if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no])) |
50 | return -ENOENT; | 51 | return -ENOENT; |
51 | 52 | ||
52 | return ata_std_prereset(ap, deadline); | 53 | return ata_std_prereset(link, deadline); |
53 | } | 54 | } |
54 | 55 | ||
55 | /** | 56 | /** |
@@ -161,7 +162,6 @@ static struct scsi_host_template ns87410_sht = { | |||
161 | }; | 162 | }; |
162 | 163 | ||
163 | static struct ata_port_operations ns87410_port_ops = { | 164 | static struct ata_port_operations ns87410_port_ops = { |
164 | .port_disable = ata_port_disable, | ||
165 | .set_piomode = ns87410_set_piomode, | 165 | .set_piomode = ns87410_set_piomode, |
166 | 166 | ||
167 | .tf_load = ata_tf_load, | 167 | .tf_load = ata_tf_load, |
@@ -184,9 +184,8 @@ static struct ata_port_operations ns87410_port_ops = { | |||
184 | .irq_handler = ata_interrupt, | 184 | .irq_handler = ata_interrupt, |
185 | .irq_clear = ata_bmdma_irq_clear, | 185 | .irq_clear = ata_bmdma_irq_clear, |
186 | .irq_on = ata_irq_on, | 186 | .irq_on = ata_irq_on, |
187 | .irq_ack = ata_irq_ack, | ||
188 | 187 | ||
189 | .port_start = ata_port_start, | 188 | .port_start = ata_sff_port_start, |
190 | }; | 189 | }; |
191 | 190 | ||
192 | static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 191 | static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id) |