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_sil680.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_sil680.c')
-rw-r--r-- | drivers/ata/pata_sil680.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index 40395804a66f..45515a22d856 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
@@ -95,15 +95,16 @@ static int sil680_cable_detect(struct ata_port *ap) { | |||
95 | 95 | ||
96 | /** | 96 | /** |
97 | * sil680_bus_reset - reset the SIL680 bus | 97 | * sil680_bus_reset - reset the SIL680 bus |
98 | * @ap: ATA port to reset | 98 | * @link: ATA link to reset |
99 | * @deadline: deadline jiffies for the operation | 99 | * @deadline: deadline jiffies for the operation |
100 | * | 100 | * |
101 | * Perform the SIL680 housekeeping when doing an ATA bus reset | 101 | * Perform the SIL680 housekeeping when doing an ATA bus reset |
102 | */ | 102 | */ |
103 | 103 | ||
104 | static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes, | 104 | static int sil680_bus_reset(struct ata_link *link, unsigned int *classes, |
105 | unsigned long deadline) | 105 | unsigned long deadline) |
106 | { | 106 | { |
107 | struct ata_port *ap = link->ap; | ||
107 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 108 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
108 | unsigned long addr = sil680_selreg(ap, 0); | 109 | unsigned long addr = sil680_selreg(ap, 0); |
109 | u8 reset; | 110 | u8 reset; |
@@ -112,7 +113,7 @@ static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes, | |||
112 | pci_write_config_byte(pdev, addr, reset | 0x03); | 113 | pci_write_config_byte(pdev, addr, reset | 0x03); |
113 | udelay(25); | 114 | udelay(25); |
114 | pci_write_config_byte(pdev, addr, reset); | 115 | pci_write_config_byte(pdev, addr, reset); |
115 | return ata_std_softreset(ap, classes, deadline); | 116 | return ata_std_softreset(link, classes, deadline); |
116 | } | 117 | } |
117 | 118 | ||
118 | static void sil680_error_handler(struct ata_port *ap) | 119 | static void sil680_error_handler(struct ata_port *ap) |