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_sl82c105.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_sl82c105.c')
-rw-r--r-- | drivers/ata/pata_sl82c105.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c index c0f43bb25956..375c3705dc43 100644 --- a/drivers/ata/pata_sl82c105.c +++ b/drivers/ata/pata_sl82c105.c | |||
@@ -43,23 +43,24 @@ enum { | |||
43 | 43 | ||
44 | /** | 44 | /** |
45 | * sl82c105_pre_reset - probe begin | 45 | * sl82c105_pre_reset - probe begin |
46 | * @ap: ATA port | 46 | * @link: ATA link |
47 | * @deadline: deadline jiffies for the operation | 47 | * @deadline: deadline jiffies for the operation |
48 | * | 48 | * |
49 | * Set up cable type and use generic probe init | 49 | * Set up cable type and use generic probe init |
50 | */ | 50 | */ |
51 | 51 | ||
52 | static int sl82c105_pre_reset(struct ata_port *ap, unsigned long deadline) | 52 | static int sl82c105_pre_reset(struct ata_link *link, unsigned long deadline) |
53 | { | 53 | { |
54 | static const struct pci_bits sl82c105_enable_bits[] = { | 54 | static const struct pci_bits sl82c105_enable_bits[] = { |
55 | { 0x40, 1, 0x01, 0x01 }, | 55 | { 0x40, 1, 0x01, 0x01 }, |
56 | { 0x40, 1, 0x10, 0x10 } | 56 | { 0x40, 1, 0x10, 0x10 } |
57 | }; | 57 | }; |
58 | struct ata_port *ap = link->ap; | ||
58 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 59 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
59 | 60 | ||
60 | if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) | 61 | if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) |
61 | return -ENOENT; | 62 | return -ENOENT; |
62 | return ata_std_prereset(ap, deadline); | 63 | return ata_std_prereset(link, deadline); |
63 | } | 64 | } |
64 | 65 | ||
65 | 66 | ||