]> git.baikalelectronics.ru Git - kernel.git/commit
ide: falconide/q40ide - Use __ide_mm_{in,out}sw() for data
authorGeert Uytterhoeven <geert@linux-m68k.org>
Wed, 8 Apr 2009 12:12:48 +0000 (14:12 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 8 Apr 2009 12:12:48 +0000 (14:12 +0200)
commit9f1ccd1518d29aa1390062933da36875bd7fa073
treebeb7709e7b6ffecaad9159062499adfb84746212
parent357a78485f76664a53eafc050ce337dc3998121d
ide: falconide/q40ide - Use __ide_mm_{in,out}sw() for data

Both of commits 94078817fa8f3dc65080e8eef8d245e69d858ddc ("ide: cleanup
<asm-m68k/ide.h>") and b31344ff5b4ffc63d7070bef60b84b88b8b5b29f ("ide: include
<asm/ide.h> only when needed") break falconide:

| Uniform Multi-Platform E-IDE driver
| ide: Falcon IDE controller
| Probing IDE interface ide0...
| hda: Sarge m68k, ATA DISK drive
| ide0 at 0xfff00000 on irq 15 (serialized)
| ide-gd driver 1.18
| hda: max request size: 128KiB
| hda: 2118816 sectors (1084 MB) w/256KiB Cache, CHS=2102/16/63
|  hda:<4>hda: lost interrupt

This happens because falconide relies on {in,out}sw() being redefined in
<asm/ide.h>, as included by <linux/ide.h>, which is no longer the case.
Use __ide_mm_{in,out}sw() from <asm/ide.h> instead, just like
ide_{in,out}put_data() do.

The same problem seems to exist in q40ide.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/falconide.c
drivers/ide/q40ide.c