From 633dfa8303cc9f0f6a041177974df3f8729674be Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 27 Mar 2009 12:46:23 +0100 Subject: [PATCH] --- yaml --- r: 137631 b: refs/heads/master c: f94116aeec7a299640dd692128e1d22178affa8d h: refs/heads/master i: 137629: e0c4c928bb20503a77e5cabcfb75132b4cc365de 137627: c57946de97422f9ae777c18fa8268a8d3ea3848d 137623: eb05453fd0cd6ca2163614147b953ba54207f980 137615: 13b62de94d929d77460ac1b9225aeb62b8ed7d3e 137599: 84075fcc714f87bd35bc77e372fb189b9aa334cf v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/ide.h | 34 ------------------------------- trunk/drivers/ide/falconide.c | 4 ++-- trunk/drivers/ide/q40ide.c | 4 ++-- 4 files changed, 5 insertions(+), 39 deletions(-) diff --git a/[refs] b/[refs] index 8a00b18d661e..82f0ab52213a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09a3e79187c56842d509430267ece5b82216baee +refs/heads/master: f94116aeec7a299640dd692128e1d22178affa8d diff --git a/trunk/arch/m68k/include/asm/ide.h b/trunk/arch/m68k/include/asm/ide.h index 4e6e77759f88..3958726664ba 100644 --- a/trunk/arch/m68k/include/asm/ide.h +++ b/trunk/arch/m68k/include/asm/ide.h @@ -30,62 +30,28 @@ #define _M68K_IDE_H #ifdef __KERNEL__ - - #include #include #include -#ifdef CONFIG_MAC -#include -#endif - /* * Get rid of defs from io.h - ide has its private and conflicting versions * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we * always use the `raw' MMIO versions */ -#undef inb -#undef inw -#undef insw -#undef inl -#undef insl -#undef outb -#undef outw -#undef outsw -#undef outl -#undef outsl #undef readb #undef readw -#undef readl #undef writeb #undef writew -#undef writel -#define inb in_8 -#define inw in_be16 -#define insw(port, addr, n) raw_insw((u16 *)port, addr, n) -#define inl in_be32 -#define insl(port, addr, n) raw_insl((u32 *)port, addr, n) -#define outb(val, port) out_8(port, val) -#define outw(val, port) out_be16(port, val) -#define outsw(port, addr, n) raw_outsw((u16 *)port, addr, n) -#define outl(val, port) out_be32(port, val) -#define outsl(port, addr, n) raw_outsl((u32 *)port, addr, n) #define readb in_8 #define readw in_be16 #define __ide_mm_insw(port, addr, n) raw_insw((u16 *)port, addr, n) -#define readl in_be32 #define __ide_mm_insl(port, addr, n) raw_insl((u32 *)port, addr, n) #define writeb(val, port) out_8(port, val) #define writew(val, port) out_be16(port, val) #define __ide_mm_outsw(port, addr, n) raw_outsw((u16 *)port, addr, n) -#define writel(val, port) out_be32(port, val) #define __ide_mm_outsl(port, addr, n) raw_outsl((u32 *)port, addr, n) -#if defined(CONFIG_ATARI) || defined(CONFIG_Q40) -#define insw_swapw(port, addr, n) raw_insw_swapw((u16 *)port, addr, n) -#define outsw_swapw(port, addr, n) raw_outsw_swapw((u16 *)port, addr, n) -#endif #endif /* __KERNEL__ */ #endif /* _M68K_IDE_H */ diff --git a/trunk/drivers/ide/falconide.c b/trunk/drivers/ide/falconide.c index 27a569520743..bb0c86e976e4 100644 --- a/trunk/drivers/ide/falconide.c +++ b/trunk/drivers/ide/falconide.c @@ -70,7 +70,7 @@ static void falconide_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 falconide_output_data(ide_drive_t *drive, struct request *rq, @@ -81,7 +81,7 @@ static void falconide_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); } /* Atari has a byte-swapped IDE interface */ diff --git a/trunk/drivers/ide/q40ide.c b/trunk/drivers/ide/q40ide.c index fa8922ef3c65..ebd576df2d84 100644 --- a/trunk/drivers/ide/q40ide.c +++ b/trunk/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 */