Commit 15e51b0a authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] eliminate use of ide_ioreg_t on ARM

parent 7d52ede7
/* /*
* linux/drivers/ide/icside.c * linux/drivers/ide/arm/icside.c
* *
* Copyright (c) 1996-2002 Russell King. * Copyright (c) 1996-2002 Russell King.
* *
...@@ -813,7 +813,7 @@ static ide_hwif_t *icside_find_hwif(unsigned long dataport) ...@@ -813,7 +813,7 @@ static ide_hwif_t *icside_find_hwif(unsigned long dataport)
for (index = 0; index < MAX_HWIFS; ++index) { for (index = 0; index < MAX_HWIFS; ++index) {
hwif = &ide_hwifs[index]; hwif = &ide_hwifs[index];
if (hwif->io_ports[IDE_DATA_OFFSET] == (ide_ioreg_t)dataport) if (hwif->io_ports[IDE_DATA_OFFSET] == dataport)
goto found; goto found;
} }
...@@ -841,8 +841,8 @@ icside_setup(unsigned long base, struct cardinfo *info, int irq) ...@@ -841,8 +841,8 @@ icside_setup(unsigned long base, struct cardinfo *info, int irq)
memset(&hwif->hw, 0, sizeof(hw_regs_t)); memset(&hwif->hw, 0, sizeof(hw_regs_t));
for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) { for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
hwif->hw.io_ports[i] = (ide_ioreg_t)port; hwif->hw.io_ports[i] = port;
hwif->io_ports[i] = (ide_ioreg_t)port; hwif->io_ports[i] = port;
port += 1 << info->stepping; port += 1 << info->stepping;
} }
hwif->hw.io_ports[IDE_CONTROL_OFFSET] = base + info->ctrloffset; hwif->hw.io_ports[IDE_CONTROL_OFFSET] = base + info->ctrloffset;
......
/* /*
* linux/drivers/ide/rapide.c * linux/drivers/ide/arm/rapide.c
* *
* Copyright (c) 1996-2002 Russell King. * Copyright (c) 1996-2002 Russell King.
*/ */
...@@ -25,7 +25,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -25,7 +25,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
memset(&hw, 0, sizeof(hw)); memset(&hw, 0, sizeof(hw));
for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) { for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
hw.io_ports[i] = (ide_ioreg_t)port; hw.io_ports[i] = port;
port += 1 << 4; port += 1 << 4;
} }
hw.io_ports[IDE_CONTROL_OFFSET] = port + 0x206; hw.io_ports[IDE_CONTROL_OFFSET] = port + 0x206;
......
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