Commit 67c6746d authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] path/ide_ioreg_t fixes for legacy drivers

parent eca5940b
/* /*
* linux/drivers/ide/buddha.c -- Amiga Buddha, Catweasel and X-Surf IDE Driver * linux/drivers/ide/legacy/buddha.c -- Amiga Buddha, Catweasel and X-Surf IDE Driver
* *
* Copyright (C) 1997, 2001 by Geert Uytterhoeven and others * Copyright (C) 1997, 2001 by Geert Uytterhoeven and others
* *
...@@ -197,16 +197,16 @@ void __init buddha_init(void) ...@@ -197,16 +197,16 @@ void __init buddha_init(void)
for(i=0;i<buddha_num_hwifs;i++) { for(i=0;i<buddha_num_hwifs;i++) {
if(type != BOARD_XSURF) { if(type != BOARD_XSURF) {
ide_setup_ports(&hw, (ide_ioreg_t)(buddha_board+buddha_bases[i]), ide_setup_ports(&hw, (buddha_board+buddha_bases[i]),
buddha_offsets, 0, buddha_offsets, 0,
(ide_ioreg_t)(buddha_board+buddha_irqports[i]), (buddha_board+buddha_irqports[i]),
buddha_ack_intr, buddha_ack_intr,
// budda_iops, // budda_iops,
IRQ_AMIGA_PORTS); IRQ_AMIGA_PORTS);
} else { } else {
ide_setup_ports(&hw, (ide_ioreg_t)(buddha_board+xsurf_bases[i]), ide_setup_ports(&hw, (buddha_board+xsurf_bases[i]),
xsurf_offsets, 0, xsurf_offsets, 0,
(ide_ioreg_t)(buddha_board+xsurf_irqports[i]), (buddha_board+xsurf_irqports[i]),
xsurf_ack_intr, xsurf_ack_intr,
// xsurf_iops, // xsurf_iops,
IRQ_AMIGA_PORTS); IRQ_AMIGA_PORTS);
......
/* /*
* linux/drivers/ide/dtc2278.c Version 0.02 Feb 10, 1996 * linux/drivers/ide/legacy/dtc2278.c Version 0.02 Feb 10, 1996
* *
* Copyright (C) 1996 Linus Torvalds & author (see below) * Copyright (C) 1996 Linus Torvalds & author (see below)
*/ */
......
/* /*
* linux/drivers/ide/falconide.c -- Atari Falcon IDE Driver * linux/drivers/ide/legacy/falconide.c -- Atari Falcon IDE Driver
* *
* Created 12 Jul 1997 by Geert Uytterhoeven * Created 12 Jul 1997 by Geert Uytterhoeven
* *
...@@ -66,7 +66,7 @@ void __init falconide_init(void) ...@@ -66,7 +66,7 @@ void __init falconide_init(void)
hw_regs_t hw; hw_regs_t hw;
int index; int index;
ide_setup_ports(&hw, (ide_ioreg_t)ATA_HD_BASE, falconide_offsets, ide_setup_ports(&hw, ATA_HD_BASE, falconide_offsets,
0, 0, NULL, 0, 0, NULL,
// falconide_iops, // falconide_iops,
IRQ_MFP_IDE); IRQ_MFP_IDE);
......
/* /*
* linux/drivers/ide/gayle.c -- Amiga Gayle IDE Driver * linux/drivers/ide/legacy/gayle.c -- Amiga Gayle IDE Driver
* *
* Created 9 Jul 1997 by Geert Uytterhoeven * Created 9 Jul 1997 by Geert Uytterhoeven
* *
...@@ -122,7 +122,7 @@ void __init gayle_init(void) ...@@ -122,7 +122,7 @@ void __init gayle_init(void)
return; return;
for (i = 0; i < GAYLE_NUM_PROBE_HWIFS; i++) { for (i = 0; i < GAYLE_NUM_PROBE_HWIFS; i++) {
ide_ioreg_t base, ctrlport, irqport; unsigned long base, ctrlport, irqport;
ide_ack_intr_t *ack_intr; ide_ack_intr_t *ack_intr;
hw_regs_t hw; hw_regs_t hw;
int index; int index;
...@@ -130,11 +130,11 @@ void __init gayle_init(void) ...@@ -130,11 +130,11 @@ void __init gayle_init(void)
if (a4000) { if (a4000) {
phys_base = GAYLE_BASE_4000; phys_base = GAYLE_BASE_4000;
irqport = (ide_ioreg_t)ZTWO_VADDR(GAYLE_IRQ_4000); irqport = (unsigned long)ZTWO_VADDR(GAYLE_IRQ_4000);
ack_intr = gayle_ack_intr_a4000; ack_intr = gayle_ack_intr_a4000;
} else { } else {
phys_base = GAYLE_BASE_1200; phys_base = GAYLE_BASE_1200;
irqport = (ide_ioreg_t)ZTWO_VADDR(GAYLE_IRQ_1200); irqport = (unsigned long)ZTWO_VADDR(GAYLE_IRQ_1200);
ack_intr = gayle_ack_intr_a1200; ack_intr = gayle_ack_intr_a1200;
} }
/* /*
...@@ -149,7 +149,7 @@ void __init gayle_init(void) ...@@ -149,7 +149,7 @@ void __init gayle_init(void)
if (!request_mem_region(res_start, res_n, "IDE")) if (!request_mem_region(res_start, res_n, "IDE"))
continue; continue;
base = (ide_ioreg_t)ZTWO_VADDR(phys_base); base = (unsigned long)ZTWO_VADDR(phys_base);
ctrlport = GAYLE_HAS_CONTROL_REG ? (base + GAYLE_CONTROL) : 0; ctrlport = GAYLE_HAS_CONTROL_REG ? (base + GAYLE_CONTROL) : 0;
ide_setup_ports(&hw, base, gayle_offsets, ide_setup_ports(&hw, base, gayle_offsets,
......
/* /*
* linux/drivers/ide/ht6560b.c Version 0.07 Feb 1, 2000 * linux/drivers/ide/legacy/ht6560b.c Version 0.07 Feb 1, 2000
* *
* Copyright (C) 1995-2000 Linus Torvalds & author (see below) * Copyright (C) 1995-2000 Linus Torvalds & author (see below)
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment