ide: skip "VLB sync" if host uses MMIO
* Skip "VLB sync" in ata_{in,out}put_data() if host uses MMIO.
* Use I/O ops directly in ata_vlb_sync() an drop no longer needed
'ide_drive_t *drive' argument.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index daa23b1..60e3048 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -227,11 +227,11 @@
* of the sector count register location, with interrupts disabled
* to ensure that the reads all happen together.
*/
-static void ata_vlb_sync(ide_drive_t *drive, unsigned long port)
+static void ata_vlb_sync(unsigned long port)
{
- (void) HWIF(drive)->INB(port);
- (void) HWIF(drive)->INB(port);
- (void) HWIF(drive)->INB(port);
+ (void)inb(port);
+ (void)inb(port);
+ (void)inb(port);
}
/*
@@ -255,9 +255,9 @@
if (io_32bit) {
unsigned long uninitialized_var(flags);
- if (io_32bit & 2) {
+ if ((io_32bit & 2) && !mmio) {
local_irq_save(flags);
- ata_vlb_sync(drive, io_ports->nsect_addr);
+ ata_vlb_sync(io_ports->nsect_addr);
}
if (mmio)
@@ -265,7 +265,7 @@
else
insl(data_addr, buf, len / 4);
- if (io_32bit & 2)
+ if ((io_32bit & 2) && !mmio)
local_irq_restore(flags);
if ((len & 3) >= 2) {
@@ -298,9 +298,9 @@
if (io_32bit) {
unsigned long uninitialized_var(flags);
- if (io_32bit & 2) {
+ if ((io_32bit & 2) && !mmio) {
local_irq_save(flags);
- ata_vlb_sync(drive, io_ports->nsect_addr);
+ ata_vlb_sync(io_ports->nsect_addr);
}
if (mmio)
@@ -308,7 +308,7 @@
else
outsl(data_addr, buf, len / 4);
- if (io_32bit & 2)
+ if ((io_32bit & 2) && !mmio)
local_irq_restore(flags);
if ((len & 3) >= 2) {