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_efar.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_efar.c')
-rw-r--r-- | drivers/ata/pata_efar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c index c8ba59c56114..9f6fae6e38bf 100644 --- a/drivers/ata/pata_efar.c +++ b/drivers/ata/pata_efar.c | |||
@@ -26,25 +26,26 @@ | |||
26 | 26 | ||
27 | /** | 27 | /** |
28 | * efar_pre_reset - Enable bits | 28 | * efar_pre_reset - Enable bits |
29 | * @ap: Port | 29 | * @link: ATA link |
30 | * @deadline: deadline jiffies for the operation | 30 | * @deadline: deadline jiffies for the operation |
31 | * | 31 | * |
32 | * Perform cable detection for the EFAR ATA interface. This is | 32 | * Perform cable detection for the EFAR ATA interface. This is |
33 | * different to the PIIX arrangement | 33 | * different to the PIIX arrangement |
34 | */ | 34 | */ |
35 | 35 | ||
36 | static int efar_pre_reset(struct ata_port *ap, unsigned long deadline) | 36 | static int efar_pre_reset(struct ata_link *link, unsigned long deadline) |
37 | { | 37 | { |
38 | static const struct pci_bits efar_enable_bits[] = { | 38 | static const struct pci_bits efar_enable_bits[] = { |
39 | { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ | 39 | { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ |
40 | { 0x43U, 1U, 0x80UL, 0x80UL }, /* port 1 */ | 40 | { 0x43U, 1U, 0x80UL, 0x80UL }, /* port 1 */ |
41 | }; | 41 | }; |
42 | struct ata_port *ap = link->ap; | ||
42 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 43 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
43 | 44 | ||
44 | if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no])) | 45 | if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no])) |
45 | return -ENOENT; | 46 | return -ENOENT; |
46 | 47 | ||
47 | return ata_std_prereset(ap, deadline); | 48 | return ata_std_prereset(link, deadline); |
48 | } | 49 | } |
49 | 50 | ||
50 | /** | 51 | /** |