lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libata: move ata_altstatus() to pio data xfer functions

Browse Source 
Move ata_altstatus() out from ata_hsm_move() to the pio data xfer
functions like ata_pio_sectors() and atapi_pio_bytes() where it makes
more sense.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Albert Lee
2007-08-15 03:19:45 -04:00
committed by Jeff Garzik
parent 0bc2a79a20
commit 4cc980b34b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ata/libata-core.c
View File

@@ -4614,6 +4614,8 @@ static void ata_pio_sectors(struct ata_queued_cmd *qc)
ata_pio_sector(qc); ata_pio_sector(qc);
} else } else
ata_pio_sector(qc); ata_pio_sector(qc);
ata_altstatus(qc->ap); /* flush */
} }
/** /**
@@ -4788,6 +4790,7 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)
VPRINTK("ata%u: xfering %d bytes\n", ap->print_id, bytes); VPRINTK("ata%u: xfering %d bytes\n", ap->print_id, bytes);
__atapi_pio_bytes(qc, bytes); __atapi_pio_bytes(qc, bytes);
ata_altstatus(ap); /* flush */
return; return;
@@ -4959,7 +4962,6 @@ fsm_start:
*/ */
ap->hsm_task_state = HSM_ST; ap->hsm_task_state = HSM_ST;
ata_pio_sectors(qc); ata_pio_sectors(qc);
ata_altstatus(ap); /* flush */
} else } else
/* send CDB */ /* send CDB */
atapi_send_cdb(ap, qc); atapi_send_cdb(ap, qc);
@@ -5040,7 +5042,6 @@ fsm_start:
if (!(qc->tf.flags & ATA_TFLAG_WRITE)) { if (!(qc->tf.flags & ATA_TFLAG_WRITE)) {
ata_pio_sectors(qc); ata_pio_sectors(qc);
ata_altstatus(ap);
status = ata_wait_idle(ap); status = ata_wait_idle(ap);
} }
@@ -5060,13 +5061,11 @@ fsm_start:
if (ap->hsm_task_state == HSM_ST_LAST && if (ap->hsm_task_state == HSM_ST_LAST &&
(!(qc->tf.flags & ATA_TFLAG_WRITE))) { (!(qc->tf.flags & ATA_TFLAG_WRITE))) {
/* all data read */ /* all data read */
ata_altstatus(ap);
status = ata_wait_idle(ap); status = ata_wait_idle(ap);
goto fsm_start; goto fsm_start;
} }
} }
ata_altstatus(ap); /* flush */
poll_next = 1; poll_next = 1;
break; break;