diff options
Diffstat (limited to 'drivers/ata/ata_piix.c')
-rw-r--r-- | drivers/ata/ata_piix.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index e6b4606e36b6..81387ff48937 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -165,8 +165,10 @@ static void piix_set_dmamode(struct ata_port *ap, struct ata_device *adev); | |||
165 | static void ich_set_dmamode(struct ata_port *ap, struct ata_device *adev); | 165 | static void ich_set_dmamode(struct ata_port *ap, struct ata_device *adev); |
166 | static int ich_pata_cable_detect(struct ata_port *ap); | 166 | static int ich_pata_cable_detect(struct ata_port *ap); |
167 | static u8 piix_vmw_bmdma_status(struct ata_port *ap); | 167 | static u8 piix_vmw_bmdma_status(struct ata_port *ap); |
168 | static int piix_sidpr_scr_read(struct ata_port *ap, unsigned int reg, u32 *val); | 168 | static int piix_sidpr_scr_read(struct ata_link *link, |
169 | static int piix_sidpr_scr_write(struct ata_port *ap, unsigned int reg, u32 val); | 169 | unsigned int reg, u32 *val); |
170 | static int piix_sidpr_scr_write(struct ata_link *link, | ||
171 | unsigned int reg, u32 val); | ||
170 | #ifdef CONFIG_PM | 172 | #ifdef CONFIG_PM |
171 | static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg); | 173 | static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg); |
172 | static int piix_pci_device_resume(struct pci_dev *pdev); | 174 | static int piix_pci_device_resume(struct pci_dev *pdev); |
@@ -971,8 +973,10 @@ static u32 piix_merge_scr(u32 val0, u32 val1, const int * const *merge_tbl) | |||
971 | return val; | 973 | return val; |
972 | } | 974 | } |
973 | 975 | ||
974 | static int piix_sidpr_scr_read(struct ata_port *ap, unsigned int reg, u32 *val) | 976 | static int piix_sidpr_scr_read(struct ata_link *link, |
977 | unsigned int reg, u32 *val) | ||
975 | { | 978 | { |
979 | struct ata_port *ap = link->ap; | ||
976 | const int * const sstatus_merge_tbl[] = { | 980 | const int * const sstatus_merge_tbl[] = { |
977 | /* DET */ (const int []){ 1, 3, 0, 4, 3, -1 }, | 981 | /* DET */ (const int []){ 1, 3, 0, 4, 3, -1 }, |
978 | /* SPD */ (const int []){ 2, 1, 0, -1 }, | 982 | /* SPD */ (const int []){ 2, 1, 0, -1 }, |
@@ -1013,8 +1017,11 @@ static int piix_sidpr_scr_read(struct ata_port *ap, unsigned int reg, u32 *val) | |||
1013 | return 0; | 1017 | return 0; |
1014 | } | 1018 | } |
1015 | 1019 | ||
1016 | static int piix_sidpr_scr_write(struct ata_port *ap, unsigned int reg, u32 val) | 1020 | static int piix_sidpr_scr_write(struct ata_link *link, |
1021 | unsigned int reg, u32 val) | ||
1017 | { | 1022 | { |
1023 | struct ata_port *ap = link->ap; | ||
1024 | |||
1018 | if (reg >= ARRAY_SIZE(piix_sidx_map)) | 1025 | if (reg >= ARRAY_SIZE(piix_sidx_map)) |
1019 | return -EINVAL; | 1026 | return -EINVAL; |
1020 | 1027 | ||