diff options
Diffstat (limited to 'drivers/ata/pata_it8213.c')
-rw-r--r-- | drivers/ata/pata_it8213.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c index b8af55e89156..1eda821e5e39 100644 --- a/drivers/ata/pata_it8213.c +++ b/drivers/ata/pata_it8213.c | |||
@@ -23,23 +23,24 @@ | |||
23 | 23 | ||
24 | /** | 24 | /** |
25 | * it8213_pre_reset - check for 40/80 pin | 25 | * it8213_pre_reset - check for 40/80 pin |
26 | * @ap: Port | 26 | * @link: link |
27 | * @deadline: deadline jiffies for the operation | 27 | * @deadline: deadline jiffies for the operation |
28 | * | 28 | * |
29 | * Filter out ports by the enable bits before doing the normal reset | 29 | * Filter out ports by the enable bits before doing the normal reset |
30 | * and probe. | 30 | * and probe. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | static int it8213_pre_reset(struct ata_port *ap, unsigned long deadline) | 33 | static int it8213_pre_reset(struct ata_link *link, unsigned long deadline) |
34 | { | 34 | { |
35 | static const struct pci_bits it8213_enable_bits[] = { | 35 | static const struct pci_bits it8213_enable_bits[] = { |
36 | { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ | 36 | { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ |
37 | }; | 37 | }; |
38 | struct ata_port *ap = link->ap; | ||
38 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 39 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
39 | if (!pci_test_config_bits(pdev, &it8213_enable_bits[ap->port_no])) | 40 | if (!pci_test_config_bits(pdev, &it8213_enable_bits[ap->port_no])) |
40 | return -ENOENT; | 41 | return -ENOENT; |
41 | 42 | ||
42 | return ata_std_prereset(ap, deadline); | 43 | return ata_std_prereset(link, deadline); |
43 | } | 44 | } |
44 | 45 | ||
45 | /** | 46 | /** |
@@ -260,7 +261,6 @@ static struct scsi_host_template it8213_sht = { | |||
260 | }; | 261 | }; |
261 | 262 | ||
262 | static const struct ata_port_operations it8213_ops = { | 263 | static const struct ata_port_operations it8213_ops = { |
263 | .port_disable = ata_port_disable, | ||
264 | .set_piomode = it8213_set_piomode, | 264 | .set_piomode = it8213_set_piomode, |
265 | .set_dmamode = it8213_set_dmamode, | 265 | .set_dmamode = it8213_set_dmamode, |
266 | .mode_filter = ata_pci_default_filter, | 266 | .mode_filter = ata_pci_default_filter, |
@@ -288,9 +288,8 @@ static const struct ata_port_operations it8213_ops = { | |||
288 | .irq_handler = ata_interrupt, | 288 | .irq_handler = ata_interrupt, |
289 | .irq_clear = ata_bmdma_irq_clear, | 289 | .irq_clear = ata_bmdma_irq_clear, |
290 | .irq_on = ata_irq_on, | 290 | .irq_on = ata_irq_on, |
291 | .irq_ack = ata_irq_ack, | ||
292 | 291 | ||
293 | .port_start = ata_port_start, | 292 | .port_start = ata_sff_port_start, |
294 | }; | 293 | }; |
295 | 294 | ||
296 | 295 | ||