From: Al Viro Date: Mon, 28 Apr 2008 05:59:25 +0000 (+0100) Subject: more icside breakage (from next ide merge) X-Git-Tag: v2.6.26-rc1~710 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7d896e0b8e37ae7f74088ce74bf81b58b423b48b;p=linux-2.6-omap-h63xx.git more icside breakage (from next ide merge) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 124445c2092..65038ca35e1 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c @@ -419,17 +419,19 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e hwif = ide_find_port(); if (hwif) { - int i; - /* * Ensure we're using MMIO */ default_hwif_mmiops(hwif); - for (i = 0; i <= 7; i++) { - hwif->io_ports_array[i] = port; - port += 1 << info->stepping; - } + hwif->io_ports.data_addr = port; + hwif->io_ports.error_addr = port + (1 << info->stepping); + hwif->io_ports.nsect_addr = port + (2 << info->stepping); + hwif->io_ports.lbal_addr = port + (3 << info->stepping); + hwif->io_ports.lbam_addr = port + (4 << info->stepping); + hwif->io_ports.lbah_addr = port + (5 << info->stepping); + hwif->io_ports.device_addr = port + (6 << info->stepping); + hwif->io_ports.status_addr = port + (7 << info->stepping); hwif->io_ports.ctl_addr = (unsigned long)base + info->ctrloffset; hwif->irq = ec->irq;