aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-core.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-core.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-core.c')
-rw-r--r--drivers/ata/libata-core.c24
1 files changed, 4 insertions, 20 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 5f771bb44332..eaead76c9443 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -76,7 +76,7 @@ const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 };
76const struct ata_port_operations ata_base_port_ops = { 76const struct ata_port_operations ata_base_port_ops = {
77 .prereset = ata_std_prereset, 77 .prereset = ata_std_prereset,
78 .hardreset = sata_sff_hardreset, 78 .hardreset = sata_sff_hardreset,
79 .postreset = ata_sff_postreset, 79 .postreset = ata_std_postreset,
80 .error_handler = ata_std_error_handler, 80 .error_handler = ata_std_error_handler,
81}; 81};
82 82
@@ -3516,7 +3516,7 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
3516} 3516}
3517 3517
3518/** 3518/**
3519 * ata_sff_postreset - standard postreset callback 3519 * ata_std_postreset - standard postreset callback
3520 * @link: the target ata_link 3520 * @link: the target ata_link
3521 * @classes: classes of attached devices 3521 * @classes: classes of attached devices
3522 * 3522 *
@@ -3527,9 +3527,8 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
3527 * LOCKING: 3527 * LOCKING:
3528 * Kernel thread context (may sleep) 3528 * Kernel thread context (may sleep)
3529 */ 3529 */
3530void ata_sff_postreset(struct ata_link *link, unsigned int *classes) 3530void ata_std_postreset(struct ata_link *link, unsigned int *classes)
3531{ 3531{
3532 struct ata_port *ap = link->ap;
3533 u32 serror; 3532 u32 serror;
3534 3533
3535 DPRINTK("ENTER\n"); 3534 DPRINTK("ENTER\n");
@@ -3542,22 +3541,6 @@ void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
3542 sata_scr_write(link, SCR_ERROR, serror); 3541 sata_scr_write(link, SCR_ERROR, serror);
3543 link->eh_info.serror = 0; 3542 link->eh_info.serror = 0;
3544 3543
3545 /* is double-select really necessary? */
3546 if (classes[0] != ATA_DEV_NONE)
3547 ap->ops->sff_dev_select(ap, 1);
3548 if (classes[1] != ATA_DEV_NONE)
3549 ap->ops->sff_dev_select(ap, 0);
3550
3551 /* bail out if no device is present */
3552 if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
3553 DPRINTK("EXIT, no device\n");
3554 return;
3555 }
3556
3557 /* set up device control */
3558 if (ap->ioaddr.ctl_addr)
3559 iowrite8(ap->ctl, ap->ioaddr.ctl_addr);
3560
3561 DPRINTK("EXIT\n"); 3544 DPRINTK("EXIT\n");
3562} 3545}
3563 3546
@@ -6096,6 +6079,7 @@ EXPORT_SYMBOL_GPL(sata_link_debounce);
6096EXPORT_SYMBOL_GPL(sata_link_resume); 6079EXPORT_SYMBOL_GPL(sata_link_resume);
6097EXPORT_SYMBOL_GPL(ata_std_prereset); 6080EXPORT_SYMBOL_GPL(ata_std_prereset);
6098EXPORT_SYMBOL_GPL(sata_link_hardreset); 6081EXPORT_SYMBOL_GPL(sata_link_hardreset);
6082EXPORT_SYMBOL_GPL(ata_std_postreset);
6099EXPORT_SYMBOL_GPL(ata_dev_classify); 6083EXPORT_SYMBOL_GPL(ata_dev_classify);
6100EXPORT_SYMBOL_GPL(ata_dev_pair); 6084EXPORT_SYMBOL_GPL(ata_dev_pair);
6101EXPORT_SYMBOL_GPL(ata_port_disable); 6085EXPORT_SYMBOL_GPL(ata_port_disable);