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_oldpiix.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_oldpiix.c')
-rw-r--r-- | drivers/ata/pata_oldpiix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c index 091a70a0ef1c..5b2c86fe9fc2 100644 --- a/drivers/ata/pata_oldpiix.c +++ b/drivers/ata/pata_oldpiix.c | |||
@@ -29,14 +29,15 @@ | |||
29 | 29 | ||
30 | /** | 30 | /** |
31 | * oldpiix_pre_reset - probe begin | 31 | * oldpiix_pre_reset - probe begin |
32 | * @ap: ATA port | 32 | * @link: ATA link |
33 | * @deadline: deadline jiffies for the operation | 33 | * @deadline: deadline jiffies for the operation |
34 | * | 34 | * |
35 | * Set up cable type and use generic probe init | 35 | * Set up cable type and use generic probe init |
36 | */ | 36 | */ |
37 | 37 | ||
38 | static int oldpiix_pre_reset(struct ata_port *ap, unsigned long deadline) | 38 | static int oldpiix_pre_reset(struct ata_link *link, unsigned long deadline) |
39 | { | 39 | { |
40 | struct ata_port *ap = link->ap; | ||
40 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 41 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
41 | static const struct pci_bits oldpiix_enable_bits[] = { | 42 | static const struct pci_bits oldpiix_enable_bits[] = { |
42 | { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ | 43 | { 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */ |
@@ -46,7 +47,7 @@ static int oldpiix_pre_reset(struct ata_port *ap, unsigned long deadline) | |||
46 | if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no])) | 47 | if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no])) |
47 | return -ENOENT; | 48 | return -ENOENT; |
48 | 49 | ||
49 | return ata_std_prereset(ap, deadline); | 50 | return ata_std_prereset(link, deadline); |
50 | } | 51 | } |
51 | 52 | ||
52 | /** | 53 | /** |