Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (35 commits)
  siimage: coding style cleanup (take 2)
  ide-cd: clean up cdrom_analyze_sense_data()
  ide-cd: fix test unsigned var < 0
  ide: add TSSTcorp CDDVDW SH-S202H to ivb_list[]
  piix: add Asus Eee 701 controller to short cable list
  ARM: always select HAVE_IDE
  remove the broken ETRAX_IDE driver
  ide: remove ->dma_prdtable field from ide_hwif_t
  ide: remove ->dma_vendor{1,3} fields from ide_hwif_t
  scc_pata: add ->dma_host_set and ->dma_start methods
  ide: skip "VLB sync" if host uses MMIO
  ide: add ide_pad_transfer() helper
  ide: remove ->INW and ->OUTW methods
  ide: use IDE I/O helpers directly in ide_tf_{load,read}()
  ns87415: add ->tf_read method
  scc_pata: add ->tf_{load,read} methods
  ide-h8300: add ->tf_{load,read} methods
  ide-cris: add ->tf_{load,read} methods
  ide: add ->tf_load and ->tf_read methods
  ide: move ide_tf_{load,read} to ide-iops.c
  ...

1 files changed, 24 insertions, 0 deletions

diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index f9210458aea0..6f535d00e638 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -72,7 +72,27 @@ static void q40_ide_setup_ports(hw_regs_t *hw, unsigned long base,
         hw->ack_intr = ack_intr;
 }
 
+static void q40ide_input_data(ide_drive_t *drive, struct request *rq,
+                              void *buf, unsigned int len)
+{
+        unsigned long data_addr = drive->hwif->io_ports.data_addr;
+
+        if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS)
+                return insw(data_addr, buf, (len + 1) / 2);
 
+        insw_swapw(data_addr, buf, (len + 1) / 2);
+}
+
+static void q40ide_output_data(ide_drive_t *drive, struct request *rq,
+                               void *buf, unsigned int len)
+{
+        unsigned long data_addr = drive->hwif->io_ports.data_addr;
+
+        if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS)
+                return outsw(data_addr, buf, (len + 1) / 2);
+
+        outsw_swapw(data_addr, buf, (len + 1) / 2);
+}
 
 /* 
  * the static array is needed to have the name reported in /proc/ioports,
@@ -123,6 +143,10 @@ static int __init q40ide_init(void)
                 ide_init_port_data(hwif, hwif->index);
                 ide_init_port_hw(hwif, &hw);
 
+                /* Q40 has a byte-swapped IDE interface */
+                hwif->input_data  = q40ide_input_data;
+                hwif->output_data = q40ide_output_data;
+
                 idx[i] = hwif->index;
         }
     }