Messages in this thread Patch in this message | | | Subject | PATCH: eliminate use of ide_ioreg_t on ARM | Date | Tue, 18 Feb 2003 17:58:00 +0000 (GMT) | From | Alan Cox <> |
| |
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.61/drivers/ide/arm/icside.c linux-2.5.61-ac2/drivers/ide/arm/icside.c --- linux-2.5.61/drivers/ide/arm/icside.c 2003-02-10 18:38:38.000000000 +0000 +++ linux-2.5.61-ac2/drivers/ide/arm/icside.c 2003-02-18 18:06:19.000000000 +0000 @@ -1,5 +1,5 @@ /* - * linux/drivers/ide/icside.c + * linux/drivers/ide/arm/icside.c * * Copyright (c) 1996-2002 Russell King. * @@ -813,7 +813,7 @@ for (index = 0; index < MAX_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; } @@ -841,8 +841,8 @@ memset(&hwif->hw, 0, sizeof(hw_regs_t)); for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) { - hwif->hw.io_ports[i] = (ide_ioreg_t)port; - hwif->io_ports[i] = (ide_ioreg_t)port; + hwif->hw.io_ports[i] = port; + hwif->io_ports[i] = port; port += 1 << info->stepping; } hwif->hw.io_ports[IDE_CONTROL_OFFSET] = base + info->ctrloffset; diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.61/drivers/ide/arm/rapide.c linux-2.5.61-ac2/drivers/ide/arm/rapide.c --- linux-2.5.61/drivers/ide/arm/rapide.c 2003-02-10 18:38:49.000000000 +0000 +++ linux-2.5.61-ac2/drivers/ide/arm/rapide.c 2003-02-18 18:06:19.000000000 +0000 @@ -1,5 +1,5 @@ /* - * linux/drivers/ide/rapide.c + * linux/drivers/ide/arm/rapide.c * * Copyright (c) 1996-2002 Russell King. */ @@ -25,7 +25,7 @@ memset(&hw, 0, sizeof(hw)); 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; } hw.io_ports[IDE_CONTROL_OFFSET] = port + 0x206; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |