[libata irq-pio] reorganize ata_pio_sector() and __atapi_pio_bytes()
- move some code out of the kmap_atomic() / kunmap_atomic() zone
- remove the redundant "do_write = (qc->tf.flags & ATA_TFLAG_WRITE);"
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 2c9275e..f893126 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2763,6 +2763,14 @@
local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0) + offset;
+ DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
+
+ /* do the actual data transfer */
+ ata_data_xfer(ap, buf, ATA_SECT_SIZE, do_write);
+
+ kunmap_atomic(buf - offset, KM_IRQ0);
+ local_irq_restore(flags);
+
qc->cursect++;
qc->cursg_ofs++;
@@ -2770,15 +2778,6 @@
qc->cursg++;
qc->cursg_ofs = 0;
}
-
- DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
-
- /* do the actual data transfer */
- do_write = (qc->tf.flags & ATA_TFLAG_WRITE);
- ata_data_xfer(ap, buf, ATA_SECT_SIZE, do_write);
-
- kunmap_atomic(buf - offset, KM_IRQ0);
- local_irq_restore(flags);
}
/**
@@ -2956,6 +2955,14 @@
local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0) + offset;
+ DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
+
+ /* do the actual data transfer */
+ ata_data_xfer(ap, buf, count, do_write);
+
+ kunmap_atomic(buf - offset, KM_IRQ0);
+ local_irq_restore(flags);
+
bytes -= count;
qc->curbytes += count;
qc->cursg_ofs += count;
@@ -2965,14 +2972,6 @@
qc->cursg_ofs = 0;
}
- DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
-
- /* do the actual data transfer */
- ata_data_xfer(ap, buf, count, do_write);
-
- kunmap_atomic(buf - offset, KM_IRQ0);
- local_irq_restore(flags);
-
if (bytes)
goto next_sg;
}