diff options
Diffstat (limited to 'drivers/ata/pata_marvell.c')
-rw-r--r-- | drivers/ata/pata_marvell.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index b45506f1ef73..b4dd18f3fa5d 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c | |||
@@ -24,14 +24,15 @@ | |||
24 | 24 | ||
25 | /** | 25 | /** |
26 | * marvell_pre_reset - check for 40/80 pin | 26 | * marvell_pre_reset - check for 40/80 pin |
27 | * @ap: Port | 27 | * @link: link |
28 | * @deadline: deadline jiffies for the operation | 28 | * @deadline: deadline jiffies for the operation |
29 | * | 29 | * |
30 | * Perform the PATA port setup we need. | 30 | * Perform the PATA port setup we need. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline) | 33 | static int marvell_pre_reset(struct ata_link *link, unsigned long deadline) |
34 | { | 34 | { |
35 | struct ata_port *ap = link->ap; | ||
35 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 36 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
36 | u32 devices; | 37 | u32 devices; |
37 | void __iomem *barp; | 38 | void __iomem *barp; |
@@ -54,7 +55,7 @@ static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline) | |||
54 | (!(devices & 0x10))) /* PATA enable ? */ | 55 | (!(devices & 0x10))) /* PATA enable ? */ |
55 | return -ENOENT; | 56 | return -ENOENT; |
56 | 57 | ||
57 | return ata_std_prereset(ap, deadline); | 58 | return ata_std_prereset(link, deadline); |
58 | } | 59 | } |
59 | 60 | ||
60 | static int marvell_cable_detect(struct ata_port *ap) | 61 | static int marvell_cable_detect(struct ata_port *ap) |