5 files changed, 116 insertions, 73 deletions

diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index ec46c44b061c..713cef20622e 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -21,6 +21,8 @@
 #include <asm/arch/bast-map.h>
 #include <asm/arch/bast-irq.h>
 
+#define DRV_NAME "bast-ide"
+
 static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
 {
         ide_hwif_t *hwif;
@@ -33,27 +35,23 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
         base += BAST_IDE_CS;
         aux  += BAST_IDE_CS;
 
-        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                hw.io_ports[i] = (unsigned long)base;
+        for (i = 0; i <= 7; i++) {
+                hw.io_ports_array[i] = (unsigned long)base;
                 base += 0x20;
         }
 
-        hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);
+        hw.io_ports.ctl_addr = aux + (6 * 0x20);
         hw.irq = irq;
 
-        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        hwif = ide_find_port();
         if (hwif == NULL)
                 goto out;
 
         i = hwif->index;
 
-        if (hwif->present)
-                ide_unregister(i);
-        else
-                ide_init_port_data(hwif, i);
-
+        ide_init_port_data(hwif, i);
         ide_init_port_hw(hwif, &hw);
-        hwif->quirkproc = NULL;
+        hwif->port_ops = NULL;
 
         idx[0] = i;
 
@@ -64,6 +62,8 @@ out:
 
 static int __init bastide_init(void)
 {
+        unsigned long base = BAST_VA_IDEPRI + BAST_IDE_CS;
+
         /* we can treat the VR1000 and the BAST the same */
 
         if (!(machine_is_bast() || machine_is_vr1000()))
@@ -71,6 +71,11 @@ static int __init bastide_init(void)
 
         printk("BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n");
 
+        if (!request_mem_region(base, 0x400000, DRV_NAME)) {
+                printk(KERN_ERR "%s: resources busy\n", DRV_NAME);
+                return -EBUSY;
+        }
+
         bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0);
         bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1);
 
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index e816b0ffcfe6..124445c20921 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -191,6 +191,10 @@ static void icside_maskproc(ide_drive_t *drive, int mask)
         local_irq_restore(flags);
 }
 
+static const struct ide_port_ops icside_v6_no_dma_port_ops = {
+        .maskproc               = icside_maskproc,
+};
+
 #ifdef CONFIG_BLK_DEV_IDEDMA_ICS
 /*
  * SG-DMA support.
@@ -266,6 +270,11 @@ static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode)
                 ide_xfer_verbose(xfer_mode), 2000 / drive->drive_data);
 }
 
+static const struct ide_port_ops icside_v6_port_ops = {
+        .set_dma_mode           = icside_set_dma_mode,
+        .maskproc               = icside_maskproc,
+};
+
 static void icside_dma_host_set(ide_drive_t *drive, int on)
 {
 }
@@ -375,32 +384,40 @@ static void icside_dma_lost_irq(ide_drive_t *drive)
         printk(KERN_ERR "%s: IRQ lost\n", drive->name);
 }
 
-static void icside_dma_init(ide_hwif_t *hwif)
+static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d)
 {
         hwif->dmatable_cpu      = NULL;
         hwif->dmatable_dma      = 0;
-        hwif->set_dma_mode      = icside_set_dma_mode;
-
-        hwif->dma_host_set      = icside_dma_host_set;
-        hwif->dma_setup         = icside_dma_setup;
-        hwif->dma_exec_cmd      = icside_dma_exec_cmd;
-        hwif->dma_start         = icside_dma_start;
-        hwif->ide_dma_end       = icside_dma_end;
-        hwif->ide_dma_test_irq  = icside_dma_test_irq;
-        hwif->dma_timeout       = icside_dma_timeout;
-        hwif->dma_lost_irq      = icside_dma_lost_irq;
+
+        return 0;
 }
+
+static const struct ide_dma_ops icside_v6_dma_ops = {
+        .dma_host_set           = icside_dma_host_set,
+        .dma_setup              = icside_dma_setup,
+        .dma_exec_cmd           = icside_dma_exec_cmd,
+        .dma_start              = icside_dma_start,
+        .dma_end                = icside_dma_end,
+        .dma_test_irq           = icside_dma_test_irq,
+        .dma_timeout            = icside_dma_timeout,
+        .dma_lost_irq           = icside_dma_lost_irq,
+};
 #else
-#define icside_dma_init(hwif)   (0)
+#define icside_v6_dma_ops NULL
 #endif
 
+static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d)
+{
+        return -EOPNOTSUPP;
+}
+
 static ide_hwif_t *
 icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *ec)
 {
         unsigned long port = (unsigned long)base + info->dataoffset;
         ide_hwif_t *hwif;
 
-        hwif = ide_find_port(port);
+        hwif = ide_find_port();
         if (hwif) {
                 int i;
 
@@ -408,15 +425,14 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e
                  * Ensure we're using MMIO
                  */
                 default_hwif_mmiops(hwif);
-                hwif->mmio = 1;
 
-                for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                        hwif->io_ports[i] = port;
+                for (i = 0; i <= 7; i++) {
+                        hwif->io_ports_array[i] = port;
                         port += 1 << info->stepping;
                 }
-                hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)base + info->ctrloffset;
+                hwif->io_ports.ctl_addr =
+                        (unsigned long)base + info->ctrloffset;
                 hwif->irq     = ec->irq;
-                hwif->noprobe = 0;
                 hwif->chipset = ide_acorn;
                 hwif->gendev.parent = &ec->dev;
                 hwif->dev = &ec->dev;
@@ -462,9 +478,10 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 }
 
 static const struct ide_port_info icside_v6_port_info __initdata = {
-        .host_flags             = IDE_HFLAG_SERIALIZE |
-                                  IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
-                                  IDE_HFLAG_NO_AUTOTUNE,
+        .init_dma               = icside_dma_off_init,
+        .port_ops               = &icside_v6_no_dma_port_ops,
+        .dma_ops                = &icside_v6_dma_ops,
+        .host_flags             = IDE_HFLAG_SERIALIZE,
         .mwdma_mask             = ATA_MWDMA2,
         .swdma_mask             = ATA_SWDMA2,
 };
@@ -526,21 +543,19 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         state->hwif[0]    = hwif;
         state->hwif[1]    = mate;
 
-        hwif->maskproc    = icside_maskproc;
         hwif->hwif_data   = state;
         hwif->config_data = (unsigned long)ioc_base;
         hwif->select_data = sel;
 
-        mate->maskproc    = icside_maskproc;
         mate->hwif_data   = state;
         mate->config_data = (unsigned long)ioc_base;
         mate->select_data = sel | 1;
 
         if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) {
-                icside_dma_init(hwif);
-                icside_dma_init(mate);
-        } else
-                d.mwdma_mask = d.swdma_mask = 0;
+                d.init_dma = icside_dma_init;
+                d.port_ops = &icside_v6_port_ops;
+                d.dma_ops = NULL;
+        }
 
         idx[0] = hwif->index;
         idx[1] = mate->index;
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index be9ff7334c52..4263ffd4ab20 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -14,6 +14,8 @@
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 
+#define DRV_NAME "ide_arm"
+
 #ifdef CONFIG_ARCH_CLPS7500
 # include <asm/arch/hardware.h>
 #
@@ -28,13 +30,27 @@ static int __init ide_arm_init(void)
 {
         ide_hwif_t *hwif;
         hw_regs_t hw;
+        unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
+        if (!request_region(base, 8, DRV_NAME)) {
+                printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
+                                DRV_NAME, base, base + 7);
+                return -EBUSY;
+        }
+
+        if (!request_region(ctl, 1, DRV_NAME)) {
+                printk(KERN_ERR "%s: I/O resource 0x%lX not free.\n",
+                                DRV_NAME, ctl);
+                release_region(base, 8);
+                return -EBUSY;
+        }
+
         memset(&hw, 0, sizeof(hw));
-        ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
+        ide_std_init_ports(&hw, base, ctl);
         hw.irq = IDE_ARM_IRQ;
 
-        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        hwif = ide_find_port();
         if (hwif) {
                 ide_init_port_hw(hwif, &hw);
                 idx[0] = hwif->index;
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c
index 420fcb78a7cd..aaf32541622d 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -96,11 +96,11 @@ static void palm_bk3710_setudmamode(void __iomem *base, unsigned int dev,
         u16 val16;
 
         /* DMA Data Setup */
-        t0 = (palm_bk3710_udmatimings[mode].cycletime + ide_palm_clk - 1)
-                        / ide_palm_clk - 1;
-        tenv = (20 + ide_palm_clk - 1) / ide_palm_clk - 1;
-        trp = (palm_bk3710_udmatimings[mode].rptime + ide_palm_clk - 1)
-                        / ide_palm_clk - 1;
+        t0 = DIV_ROUND_UP(palm_bk3710_udmatimings[mode].cycletime,
+                          ide_palm_clk) - 1;
+        tenv = DIV_ROUND_UP(20, ide_palm_clk) - 1;
+        trp = DIV_ROUND_UP(palm_bk3710_udmatimings[mode].rptime,
+                           ide_palm_clk) - 1;
 
         /* udmatim Register */
         val16 = readw(base + BK3710_UDMATIM) & (dev ? 0xFF0F : 0xFFF0);
@@ -141,8 +141,8 @@ static void palm_bk3710_setdmamode(void __iomem *base, unsigned int dev,
         cycletime = max_t(int, t->cycle, min_cycle);
 
         /* DMA Data Setup */
-        t0 = (cycletime + ide_palm_clk - 1) / ide_palm_clk;
-        td = (t->active + ide_palm_clk - 1) / ide_palm_clk;
+        t0 = DIV_ROUND_UP(cycletime, ide_palm_clk);
+        td = DIV_ROUND_UP(t->active, ide_palm_clk);
         tkw = t0 - td - 1;
         td -= 1;
 
@@ -168,9 +168,9 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate,
         struct ide_timing *t;
 
         /* PIO Data Setup */
-        t0 = (cycletime + ide_palm_clk - 1) / ide_palm_clk;
-        t2 = (ide_timing_find_mode(XFER_PIO_0 + mode)->active +
-              ide_palm_clk - 1) / ide_palm_clk;
+        t0 = DIV_ROUND_UP(cycletime, ide_palm_clk);
+        t2 = DIV_ROUND_UP(ide_timing_find_mode(XFER_PIO_0 + mode)->active,
+                          ide_palm_clk);
 
         t2i = t0 - t2 - 1;
         t2 -= 1;
@@ -192,8 +192,8 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate,
 
         /* TASKFILE Setup */
         t = ide_timing_find_mode(XFER_PIO_0 + mode);
-        t0 = (t->cyc8b + ide_palm_clk - 1) / ide_palm_clk;
-        t2 = (t->act8b + ide_palm_clk - 1) / ide_palm_clk;
+        t0 = DIV_ROUND_UP(t->cyc8b, ide_palm_clk);
+        t2 = DIV_ROUND_UP(t->act8b, ide_palm_clk);
 
         t2i = t0 - t2 - 1;
         t2 -= 1;
@@ -317,17 +317,31 @@ static u8 __devinit palm_bk3710_cable_detect(ide_hwif_t *hwif)
         return ATA_CBL_PATA80;
 }
 
-static void __devinit palm_bk3710_init_hwif(ide_hwif_t *hwif)
+static int __devinit palm_bk3710_init_dma(ide_hwif_t *hwif,
+                                          const struct ide_port_info *d)
 {
-        hwif->set_pio_mode = palm_bk3710_set_pio_mode;
-        hwif->set_dma_mode = palm_bk3710_set_dma_mode;
+        unsigned long base =
+                hwif->io_ports.data_addr - IDE_PALM_ATA_PRI_REG_OFFSET;
 
-        hwif->cable_detect = palm_bk3710_cable_detect;
+        printk(KERN_INFO "    %s: MMIO-DMA\n", hwif->name);
+
+        if (ide_allocate_dma_engine(hwif))
+                return -1;
+
+        ide_setup_dma(hwif, base);
+
+        return 0;
 }
 
+static const struct ide_port_ops palm_bk3710_ports_ops = {
+        .set_pio_mode           = palm_bk3710_set_pio_mode,
+        .set_dma_mode           = palm_bk3710_set_dma_mode,
+        .cable_detect           = palm_bk3710_cable_detect,
+};
+
 static const struct ide_port_info __devinitdata palm_bk3710_port_info = {
-        .init_hwif              = palm_bk3710_init_hwif,
-        .host_flags             = IDE_HFLAG_NO_DMA, /* hack (no PCI) */
+        .init_dma               = palm_bk3710_init_dma,
+        .port_ops               = &palm_bk3710_ports_ops,
         .pio_mask               = ATA_PIO4,
         .udma_mask              = ATA_UDMA4,    /* (input clk 99MHz) */
         .mwdma_mask             = ATA_MWDMA2,
@@ -372,30 +386,24 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
 
         pribase = mem->start + IDE_PALM_ATA_PRI_REG_OFFSET;
         for (i = 0; i < IDE_NR_PORTS - 2; i++)
-                hw.io_ports[i] = pribase + i;
-        hw.io_ports[IDE_CONTROL_OFFSET] = mem->start +
+                hw.io_ports_array[i] = pribase + i;
+        hw.io_ports.ctl_addr = mem->start +
                         IDE_PALM_ATA_PRI_CTL_OFFSET;
         hw.irq = irq->start;
         hw.chipset = ide_palm3710;
 
-        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        hwif = ide_find_port();
         if (hwif == NULL)
                 goto out;
 
         i = hwif->index;
 
-        if (hwif->present)
-                ide_unregister(i);
-        else
-                ide_init_port_data(hwif, i);
-
+        ide_init_port_data(hwif, i);
         ide_init_port_hw(hwif, &hw);
 
         hwif->mmio = 1;
         default_hwif_mmiops(hwif);
 
-        ide_setup_dma(hwif, mem->start);
-
         idx[0] = i;
 
         ide_device_add(idx, &palm_bk3710_port_info);
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index b30adcf321c3..babc1a5e128d 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -17,11 +17,11 @@ static void rapide_setup_ports(hw_regs_t *hw, void __iomem *base,
         unsigned long port = (unsigned long)base;
         int i;
 
-        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                hw->io_ports[i] = port;
+        for (i = 0; i <= 7; i++) {
+                hw->io_ports_array[i] = port;
                 port += sz;
         }
-        hw->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
+        hw->io_ports.ctl_addr = (unsigned long)ctrl;
         hw->irq = irq;
 }
 
@@ -44,7 +44,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
                 goto release;
         }
 
-        hwif = ide_find_port((unsigned long)base);
+        hwif = ide_find_port();
         if (hwif) {
                 memset(&hw, 0, sizeof(hw));
                 rapide_setup_ports(&hw, base, base + 0x818, 1 << 6, ec->irq);
@@ -53,7 +53,6 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
 
                 ide_init_port_hw(hwif, &hw);
 
-                hwif->mmio = 1;
                 default_hwif_mmiops(hwif);
 
                 idx[0] = hwif->index;
@@ -76,7 +75,7 @@ static void __devexit rapide_remove(struct expansion_card *ec)
 
         ecard_set_drvdata(ec, NULL);
 
-        ide_unregister(hwif->index);
+        ide_unregister(hwif);
 
         ecard_release_resources(ec);
 }