ide: cleanup <asm-m68k/ide.h>

* Remove superfluous <asm/macints.h> include.

* No need to re-define in/out*() macros as they are no longer used
  by m68k host drivers.

* readl() and writel() are not used by core IDE code.

* Use raw_*_swapw() directly in {falcon,q40}ide.c and remove
  {in,out}sw_swapw() macros.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index fa8922ef3c65..ebd576df2d84 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -80,7 +80,7 @@ static void q40ide_input_data(ide_drive_t *drive, struct request *rq,
         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);
+        raw_insw_swapw((u16 *)data_addr, buf, (len + 1) / 2);
 }
 
 static void q40ide_output_data(ide_drive_t *drive, struct request *rq,
@@ -91,7 +91,7 @@ static void q40ide_output_data(ide_drive_t *drive, struct request *rq,
         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);
+        raw_outsw_swapw((u16 *)data_addr, buf, (len + 1) / 2);
 }
 
 /* Q40 has a byte-swapped IDE interface */