diff options
author | Tejun Heo <htejun@gmail.com> | 2007-08-06 05:36:23 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-12 14:55:31 -0400 |
commit | cc0680a580b5be81a1ca321b58f8e9b80b5c1052 (patch) | |
tree | 57454cdfdc9890f4e8d9f532e9cd240c7361951f /drivers/ata/pata_hpt3x2n.c | |
parent | 955e57dfde4ff75e4d7329ac7a3d645b16015309 (diff) |
libata-link: linkify reset
Make reset methods and related functions deal with ata_link instead of
ata_port.
* ata_do_reset()
* ata_eh_reset()
* all prereset/reset/postreset methods and related functions
This patch introduces no behavior change.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_hpt3x2n.c')
-rw-r--r-- | drivers/ata/pata_hpt3x2n.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c index f8f234bfc8ce..739a89180eb9 100644 --- a/drivers/ata/pata_hpt3x2n.c +++ b/drivers/ata/pata_hpt3x2n.c | |||
@@ -141,21 +141,22 @@ static int hpt3x2n_cable_detect(struct ata_port *ap) | |||
141 | 141 | ||
142 | /** | 142 | /** |
143 | * hpt3x2n_pre_reset - reset the hpt3x2n bus | 143 | * hpt3x2n_pre_reset - reset the hpt3x2n bus |
144 | * @ap: ATA port to reset | 144 | * @link: ATA link to reset |
145 | * @deadline: deadline jiffies for the operation | 145 | * @deadline: deadline jiffies for the operation |
146 | * | 146 | * |
147 | * Perform the initial reset handling for the 3x2n series controllers. | 147 | * Perform the initial reset handling for the 3x2n series controllers. |
148 | * Reset the hardware and state machine, | 148 | * Reset the hardware and state machine, |
149 | */ | 149 | */ |
150 | 150 | ||
151 | static int hpt3xn_pre_reset(struct ata_port *ap, unsigned long deadline) | 151 | static int hpt3xn_pre_reset(struct ata_link *link, unsigned long deadline) |
152 | { | 152 | { |
153 | struct ata_port *ap = link->ap; | ||
153 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 154 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
154 | /* Reset the state machine */ | 155 | /* Reset the state machine */ |
155 | pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); | 156 | pci_write_config_byte(pdev, 0x50 + 4 * ap->port_no, 0x37); |
156 | udelay(100); | 157 | udelay(100); |
157 | 158 | ||
158 | return ata_std_prereset(ap, deadline); | 159 | return ata_std_prereset(link, deadline); |
159 | } | 160 | } |
160 | 161 | ||
161 | /** | 162 | /** |