Skip to content

Commit

Permalink
[libata irq-pio] reorganize "buf + offset" in ata_pio_sector()
Browse files Browse the repository at this point in the history
and __atapi_pio_bytes()

   - relocate DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ?
			"write" : "read");
   - buf + offset, buf - offset tidy up

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
  • Loading branch information
Albert Lee authored and Jeff Garzik committed Oct 9, 2005
1 parent 7282aa4 commit 083958d
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2760,15 +2760,15 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
page = nth_page(page, (offset >> PAGE_SHIFT));
offset %= PAGE_SIZE;

local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0) + offset;

DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");

local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0);

/* do the actual data transfer */
ata_data_xfer(ap, buf, ATA_SECT_SIZE, do_write);
ata_data_xfer(ap, buf + offset, ATA_SECT_SIZE, do_write);

kunmap_atomic(buf - offset, KM_IRQ0);
kunmap_atomic(buf, KM_IRQ0);
local_irq_restore(flags);

qc->cursect++;
Expand Down Expand Up @@ -2952,15 +2952,15 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
/* don't cross page boundaries */
count = min(count, (unsigned int)PAGE_SIZE - offset);

local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0) + offset;

DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");

local_irq_save(flags);
buf = kmap_atomic(page, KM_IRQ0);

/* do the actual data transfer */
ata_data_xfer(ap, buf, count, do_write);
ata_data_xfer(ap, buf + offset, count, do_write);

kunmap_atomic(buf - offset, KM_IRQ0);
kunmap_atomic(buf, KM_IRQ0);
local_irq_restore(flags);

bytes -= count;
Expand Down

0 comments on commit 083958d

Please sign in to comment.