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_triflex.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_triflex.c')
-rw-r--r-- | drivers/ata/pata_triflex.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c index af21f443db6e..bc4b6f6be963 100644 --- a/drivers/ata/pata_triflex.c +++ b/drivers/ata/pata_triflex.c | |||
@@ -47,25 +47,26 @@ | |||
47 | 47 | ||
48 | /** | 48 | /** |
49 | * triflex_prereset - probe begin | 49 | * triflex_prereset - probe begin |
50 | * @ap: ATA port | 50 | * @link: ATA link |
51 | * @deadline: deadline jiffies for the operation | 51 | * @deadline: deadline jiffies for the operation |
52 | * | 52 | * |
53 | * Set up cable type and use generic probe init | 53 | * Set up cable type and use generic probe init |
54 | */ | 54 | */ |
55 | 55 | ||
56 | static int triflex_prereset(struct ata_port *ap, unsigned long deadline) | 56 | static int triflex_prereset(struct ata_link *link, unsigned long deadline) |
57 | { | 57 | { |
58 | static const struct pci_bits triflex_enable_bits[] = { | 58 | static const struct pci_bits triflex_enable_bits[] = { |
59 | { 0x80, 1, 0x01, 0x01 }, | 59 | { 0x80, 1, 0x01, 0x01 }, |
60 | { 0x80, 1, 0x02, 0x02 } | 60 | { 0x80, 1, 0x02, 0x02 } |
61 | }; | 61 | }; |
62 | 62 | ||
63 | struct ata_port *ap = link->ap; | ||
63 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 64 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
64 | 65 | ||
65 | if (!pci_test_config_bits(pdev, &triflex_enable_bits[ap->port_no])) | 66 | if (!pci_test_config_bits(pdev, &triflex_enable_bits[ap->port_no])) |
66 | return -ENOENT; | 67 | return -ENOENT; |
67 | 68 | ||
68 | return ata_std_prereset(ap, deadline); | 69 | return ata_std_prereset(link, deadline); |
69 | } | 70 | } |
70 | 71 | ||
71 | 72 | ||