aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-eh.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-24 03:19:22 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-24 03:19:22 -0400
commitcca3974e48607c3775dc73b544a5700b2e37c21a (patch)
tree0777d6121ba199af0aad196eb5a693510ec8e62e /drivers/ata/libata-eh.c
parent54a86bfc3d4601be9c36cd4e8a1bdc580c98fa6a (diff)
libata: Grand renaming.
The biggest change is that ata_host_set is renamed to ata_host. * ata_host_set => ata_host * ata_probe_ent->host_flags => ata_probe_ent->port_flags * ata_probe_ent->host_set_flags => ata_probe_ent->_host_flags * ata_host_stats => ata_port_stats * ata_port->host => ata_port->scsi_host * ata_port->host_set => ata_port->host * ata_port_info->host_flags => ata_port_info->flags * ata_(.*)host_set(.*)\(\) => ata_\1host\2() The leading underscore in ata_probe_ent->_host_flags is to avoid reusing ->host_flags for different purpose. Currently, the only user of the field is libata-bmdma.c and probe_ent itself is scheduled to be removed. ata_port->host is reused for different purpose but this field is used inside libata core proper and of different type. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r--drivers/ata/libata-eh.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 2c476eee463f..b1b510493c2d 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -200,7 +200,7 @@ void ata_scsi_error(struct Scsi_Host *host)
200 /* synchronize with port task */ 200 /* synchronize with port task */
201 ata_port_flush_task(ap); 201 ata_port_flush_task(ap);
202 202
203 /* synchronize with host_set lock and sort out timeouts */ 203 /* synchronize with host lock and sort out timeouts */
204 204
205 /* For new EH, all qcs are finished in one of three ways - 205 /* For new EH, all qcs are finished in one of three ways -
206 * normal completion, error completion, and SCSI timeout. 206 * normal completion, error completion, and SCSI timeout.
@@ -377,7 +377,7 @@ void ata_port_wait_eh(struct ata_port *ap)
377 spin_unlock_irqrestore(ap->lock, flags); 377 spin_unlock_irqrestore(ap->lock, flags);
378 378
379 /* make sure SCSI EH is complete */ 379 /* make sure SCSI EH is complete */
380 if (scsi_host_in_recovery(ap->host)) { 380 if (scsi_host_in_recovery(ap->scsi_host)) {
381 msleep(10); 381 msleep(10);
382 goto retry; 382 goto retry;
383 } 383 }
@@ -486,7 +486,7 @@ void ata_eng_timeout(struct ata_port *ap)
486 * other commands are drained. 486 * other commands are drained.
487 * 487 *
488 * LOCKING: 488 * LOCKING:
489 * spin_lock_irqsave(host_set lock) 489 * spin_lock_irqsave(host lock)
490 */ 490 */
491void ata_qc_schedule_eh(struct ata_queued_cmd *qc) 491void ata_qc_schedule_eh(struct ata_queued_cmd *qc)
492{ 492{
@@ -513,14 +513,14 @@ void ata_qc_schedule_eh(struct ata_queued_cmd *qc)
513 * all commands are drained. 513 * all commands are drained.
514 * 514 *
515 * LOCKING: 515 * LOCKING:
516 * spin_lock_irqsave(host_set lock) 516 * spin_lock_irqsave(host lock)
517 */ 517 */
518void ata_port_schedule_eh(struct ata_port *ap) 518void ata_port_schedule_eh(struct ata_port *ap)
519{ 519{
520 WARN_ON(!ap->ops->error_handler); 520 WARN_ON(!ap->ops->error_handler);
521 521
522 ap->pflags |= ATA_PFLAG_EH_PENDING; 522 ap->pflags |= ATA_PFLAG_EH_PENDING;
523 scsi_schedule_eh(ap->host); 523 scsi_schedule_eh(ap->scsi_host);
524 524
525 DPRINTK("port EH scheduled\n"); 525 DPRINTK("port EH scheduled\n");
526} 526}
@@ -532,7 +532,7 @@ void ata_port_schedule_eh(struct ata_port *ap)
532 * Abort all active qc's of @ap and schedule EH. 532 * Abort all active qc's of @ap and schedule EH.
533 * 533 *
534 * LOCKING: 534 * LOCKING:
535 * spin_lock_irqsave(host_set lock) 535 * spin_lock_irqsave(host lock)
536 * 536 *
537 * RETURNS: 537 * RETURNS:
538 * Number of aborted qc's. 538 * Number of aborted qc's.
@@ -575,7 +575,7 @@ int ata_port_abort(struct ata_port *ap)
575 * is frozen. 575 * is frozen.
576 * 576 *
577 * LOCKING: 577 * LOCKING:
578 * spin_lock_irqsave(host_set lock) 578 * spin_lock_irqsave(host lock)
579 */ 579 */
580static void __ata_port_freeze(struct ata_port *ap) 580static void __ata_port_freeze(struct ata_port *ap)
581{ 581{
@@ -596,7 +596,7 @@ static void __ata_port_freeze(struct ata_port *ap)
596 * Abort and freeze @ap. 596 * Abort and freeze @ap.
597 * 597 *
598 * LOCKING: 598 * LOCKING:
599 * spin_lock_irqsave(host_set lock) 599 * spin_lock_irqsave(host lock)
600 * 600 *
601 * RETURNS: 601 * RETURNS:
602 * Number of aborted commands. 602 * Number of aborted commands.