aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/legacy/ide_platform.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-19 18:32:33 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-19 18:32:33 -0400
commit9239b333939dd1e5b1a9f033a1c136273d58efe8 (patch)
treec7eb49e04a549ea709cd98ddf6df66a091a062d6 /drivers/ide/legacy/ide_platform.c
parent18e181fe13b7340194d09e6dd7f571a5f96f0367 (diff)
ide: remove write-only hwif->hw
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/legacy/ide_platform.c')
-rw-r--r--drivers/ide/legacy/ide_platform.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c
index 1bc9a57b6198..7bb79f53dac8 100644
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
@@ -39,19 +39,18 @@ static ide_hwif_t *__devinit plat_ide_locate_hwif(void __iomem *base,
39 if (hwif == NULL) 39 if (hwif == NULL)
40 goto out; 40 goto out;
41 41
42 hwif->hw.io_ports[IDE_DATA_OFFSET] = port; 42 hwif->io_ports[IDE_DATA_OFFSET] = port;
43 43
44 port += (1 << pdata->ioport_shift); 44 port += (1 << pdata->ioport_shift);
45 for (i = IDE_ERROR_OFFSET; i <= IDE_STATUS_OFFSET; 45 for (i = IDE_ERROR_OFFSET; i <= IDE_STATUS_OFFSET;
46 i++, port += (1 << pdata->ioport_shift)) 46 i++, port += (1 << pdata->ioport_shift))
47 hwif->hw.io_ports[i] = port; 47 hwif->io_ports[i] = port;
48 48
49 hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl; 49 hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
50 50
51 memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports)); 51 hwif->irq = irq;
52 hwif->hw.irq = hwif->irq = irq;
53 52
54 hwif->chipset = hwif->hw.chipset = ide_generic; 53 hwif->chipset = ide_generic;
55 54
56 if (mmio) { 55 if (mmio) {
57 hwif->mmio = 1; 56 hwif->mmio = 1;