aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-sff.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 09:47:18 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:22 -0400
commit203c75b8245c5386044721d9c5eda5c6b71b3d14 (patch)
tree5a8c446c483a77dc86aca145b0b38c4a2b410dfa /drivers/ata/libata-sff.c
parent0aa1113d544226bc2c4a20d6ac1d71170512a361 (diff)
libata: separate out ata_std_postreset() from ata_sff_postreset()
Separate out generic ATA portion from ata_sff_postreset() into ata_std_postreset() and implement ata_sff_postreset() using the std version. ata_base_port_ops now has ata_std_postreset() for its postreset and ata_sff_port_ops overrides it to ata_sff_postreset(). This change affects pdc_adma, ahci, sata_fsl and sata_sil24. pdc_adma now specifies postreset to ata_sff_postreset() explicitly. sata_fsl and sata_sil24 now use ata_std_postreset() which makes no difference to them. ahci now calls ata_std_postreset() from its own postreset method, which causes no behavior difference. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/libata-sff.c')
-rw-r--r--drivers/ata/libata-sff.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 9234bc047956..e530baccc9cb 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -49,6 +49,7 @@ const struct ata_port_operations ata_sff_port_ops = {
49 .thaw = ata_sff_thaw, 49 .thaw = ata_sff_thaw,
50 .prereset = ata_sff_prereset, 50 .prereset = ata_sff_prereset,
51 .softreset = ata_sff_softreset, 51 .softreset = ata_sff_softreset,
52 .postreset = ata_sff_postreset,
52 .error_handler = ata_sff_error_handler, 53 .error_handler = ata_sff_error_handler,
53 .post_internal_cmd = ata_sff_post_internal_cmd, 54 .post_internal_cmd = ata_sff_post_internal_cmd,
54 55
@@ -2032,6 +2033,41 @@ int sata_sff_hardreset(struct ata_link *link, unsigned int *class,
2032} 2033}
2033 2034
2034/** 2035/**
2036 * ata_sff_postreset - SFF postreset callback
2037 * @link: the target SFF ata_link
2038 * @classes: classes of attached devices
2039 *
2040 * This function is invoked after a successful reset. It first
2041 * calls ata_std_postreset() and performs SFF specific postreset
2042 * processing.
2043 *
2044 * LOCKING:
2045 * Kernel thread context (may sleep)
2046 */
2047void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
2048{
2049 struct ata_port *ap = link->ap;
2050
2051 ata_std_postreset(link, classes);
2052
2053 /* is double-select really necessary? */
2054 if (classes[0] != ATA_DEV_NONE)
2055 ap->ops->sff_dev_select(ap, 1);
2056 if (classes[1] != ATA_DEV_NONE)
2057 ap->ops->sff_dev_select(ap, 0);
2058
2059 /* bail out if no device is present */
2060 if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
2061 DPRINTK("EXIT, no device\n");
2062 return;
2063 }
2064
2065 /* set up device control */
2066 if (ap->ioaddr.ctl_addr)
2067 iowrite8(ap->ctl, ap->ioaddr.ctl_addr);
2068}
2069
2070/**
2035 * ata_sff_error_handler - Stock error handler for BMDMA controller 2071 * ata_sff_error_handler - Stock error handler for BMDMA controller
2036 * @ap: port to handle error for 2072 * @ap: port to handle error for
2037 * 2073 *