diff options
Diffstat (limited to 'drivers/ata/pata_sis.c')
-rw-r--r-- | drivers/ata/pata_sis.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 9d6f81d52e18..b72227676f00 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
@@ -133,19 +133,20 @@ static int sis_66_cable_detect(struct ata_port *ap) | |||
133 | 133 | ||
134 | /** | 134 | /** |
135 | * sis_pre_reset - probe begin | 135 | * sis_pre_reset - probe begin |
136 | * @ap: ATA port | 136 | * @link: ATA link |
137 | * @deadline: deadline jiffies for the operation | 137 | * @deadline: deadline jiffies for the operation |
138 | * | 138 | * |
139 | * Set up cable type and use generic probe init | 139 | * Set up cable type and use generic probe init |
140 | */ | 140 | */ |
141 | 141 | ||
142 | static int sis_pre_reset(struct ata_port *ap, unsigned long deadline) | 142 | static int sis_pre_reset(struct ata_link *link, unsigned long deadline) |
143 | { | 143 | { |
144 | static const struct pci_bits sis_enable_bits[] = { | 144 | static const struct pci_bits sis_enable_bits[] = { |
145 | { 0x4aU, 1U, 0x02UL, 0x02UL }, /* port 0 */ | 145 | { 0x4aU, 1U, 0x02UL, 0x02UL }, /* port 0 */ |
146 | { 0x4aU, 1U, 0x04UL, 0x04UL }, /* port 1 */ | 146 | { 0x4aU, 1U, 0x04UL, 0x04UL }, /* port 1 */ |
147 | }; | 147 | }; |
148 | 148 | ||
149 | struct ata_port *ap = link->ap; | ||
149 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 150 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
150 | 151 | ||
151 | if (!pci_test_config_bits(pdev, &sis_enable_bits[ap->port_no])) | 152 | if (!pci_test_config_bits(pdev, &sis_enable_bits[ap->port_no])) |
@@ -154,7 +155,7 @@ static int sis_pre_reset(struct ata_port *ap, unsigned long deadline) | |||
154 | /* Clear the FIFO settings. We can't enable the FIFO until | 155 | /* Clear the FIFO settings. We can't enable the FIFO until |
155 | we know we are poking at a disk */ | 156 | we know we are poking at a disk */ |
156 | pci_write_config_byte(pdev, 0x4B, 0); | 157 | pci_write_config_byte(pdev, 0x4B, 0); |
157 | return ata_std_prereset(ap, deadline); | 158 | return ata_std_prereset(link, deadline); |
158 | } | 159 | } |
159 | 160 | ||
160 | 161 | ||