1 files changed, 17 insertions, 70 deletions

diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 36da913cc553..0f67f1abbbd3 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -65,8 +65,6 @@ static struct cardinfo icside_cardinfo_v6_2 = {
 };
 
 struct icside_state {
-        unsigned int channel;
-        unsigned int enabled;
         void __iomem *irq_port;
         void __iomem *ioc_base;
         unsigned int sel;
@@ -116,18 +114,11 @@ static void icside_irqenable_arcin_v6 (struct expansion_card *ec, int irqnr)
         struct icside_state *state = ec->irq_data;
         void __iomem *base = state->irq_port;
 
-        state->enabled = 1;
+        writeb(0, base + ICS_ARCIN_V6_INTROFFSET_1);
+        readb(base + ICS_ARCIN_V6_INTROFFSET_2);
 
-        switch (state->channel) {
-        case 0:
-                writeb(0, base + ICS_ARCIN_V6_INTROFFSET_1);
-                readb(base + ICS_ARCIN_V6_INTROFFSET_2);
-                break;
-        case 1:
-                writeb(0, base + ICS_ARCIN_V6_INTROFFSET_2);
-                readb(base + ICS_ARCIN_V6_INTROFFSET_1);
-                break;
-        }
+        writeb(0, base + ICS_ARCIN_V6_INTROFFSET_2);
+        readb(base + ICS_ARCIN_V6_INTROFFSET_1);
 }
 
 /* Prototype: icside_irqdisable_arcin_v6 (struct expansion_card *ec, int irqnr)
@@ -137,8 +128,6 @@ static void icside_irqdisable_arcin_v6 (struct expansion_card *ec, int irqnr)
 {
         struct icside_state *state = ec->irq_data;
 
-        state->enabled = 0;
-
         readb(state->irq_port + ICS_ARCIN_V6_INTROFFSET_1);
         readb(state->irq_port + ICS_ARCIN_V6_INTROFFSET_2);
 }
@@ -160,44 +149,6 @@ static const expansioncard_ops_t icside_ops_arcin_v6 = {
         .irqpending     = icside_irqpending_arcin_v6,
 };
 
-/*
- * Handle routing of interrupts.  This is called before
- * we write the command to the drive.
- */
-static void icside_maskproc(ide_drive_t *drive, int mask)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        struct expansion_card *ec = ECARD_DEV(hwif->dev);
-        struct icside_state *state = ecard_get_drvdata(ec);
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        state->channel = hwif->channel;
-
-        if (state->enabled && !mask) {
-                switch (hwif->channel) {
-                case 0:
-                        writeb(0, state->irq_port + ICS_ARCIN_V6_INTROFFSET_1);
-                        readb(state->irq_port + ICS_ARCIN_V6_INTROFFSET_2);
-                        break;
-                case 1:
-                        writeb(0, state->irq_port + ICS_ARCIN_V6_INTROFFSET_2);
-                        readb(state->irq_port + ICS_ARCIN_V6_INTROFFSET_1);
-                        break;
-                }
-        } else {
-                readb(state->irq_port + ICS_ARCIN_V6_INTROFFSET_2);
-                readb(state->irq_port + ICS_ARCIN_V6_INTROFFSET_1);
-        }
-
-        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.
@@ -236,7 +187,8 @@ static const struct ide_port_ops icside_v6_no_dma_port_ops = {
  */
 static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode)
 {
-        int cycle_time, use_dma_info = 0;
+        unsigned long cycle_time;
+        int use_dma_info = 0;
 
         switch (xfer_mode) {
         case XFER_MW_DMA_2:
@@ -267,15 +219,15 @@ static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode)
         if (use_dma_info && drive->id[ATA_ID_EIDE_DMA_TIME] > cycle_time)
                 cycle_time = drive->id[ATA_ID_EIDE_DMA_TIME];
 
-        drive->drive_data = cycle_time;
+        ide_set_drivedata(drive, (void *)cycle_time);
 
         printk("%s: %s selected (peak %dMB/s)\n", drive->name,
-                ide_xfer_verbose(xfer_mode), 2000 / drive->drive_data);
+                ide_xfer_verbose(xfer_mode),
+                2000 / (unsigned long)ide_get_drivedata(drive));
 }
 
 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)
@@ -320,11 +272,6 @@ static int icside_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         BUG_ON(dma_channel_active(ec->dma));
 
         /*
-         * Ensure that we have the right interrupt routed.
-         */
-        icside_maskproc(drive, 0);
-
-        /*
          * Route the DMA signals to the correct interface.
          */
         writeb(state->sel | hwif->channel, state->ioc_base);
@@ -332,7 +279,7 @@ static int icside_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         /*
          * Select the correct timing for this drive.
          */
-        set_dma_speed(ec->dma, drive->drive_data);
+        set_dma_speed(ec->dma, (unsigned long)ide_get_drivedata(drive));
 
         /*
          * Tell the DMA engine about the SG table and
@@ -381,7 +328,7 @@ static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d)
         return -EOPNOTSUPP;
 }
 
-static void icside_setup_ports(hw_regs_t *hw, void __iomem *base,
+static void icside_setup_ports(struct ide_hw *hw, void __iomem *base,
                                struct cardinfo *info, struct expansion_card *ec)
 {
         unsigned long port = (unsigned long)base + info->dataoffset;
@@ -398,11 +345,11 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base,
 
         hw->irq = ec->irq;
         hw->dev = &ec->dev;
-        hw->chipset = ide_acorn;
 }
 
 static const struct ide_port_info icside_v5_port_info = {
         .host_flags             = IDE_HFLAG_NO_DMA,
+        .chipset                = ide_acorn,
 };
 
 static int __devinit
@@ -410,7 +357,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
         void __iomem *base;
         struct ide_host *host;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        struct ide_hw hw, *hws[] = { &hw };
         int ret;
 
         base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
@@ -431,7 +378,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
         icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec);
 
-        host = ide_host_alloc(&icside_v5_port_info, hws);
+        host = ide_host_alloc(&icside_v5_port_info, hws, 1);
         if (host == NULL)
                 return -ENODEV;
 
@@ -452,11 +399,11 @@ err_free:
 
 static const struct ide_port_info icside_v6_port_info __initdata = {
         .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 | IDE_HFLAG_MMIO,
         .mwdma_mask             = ATA_MWDMA2,
         .swdma_mask             = ATA_SWDMA2,
+        .chipset                = ide_acorn,
 };
 
 static int __devinit
@@ -466,7 +413,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         struct ide_host *host;
         unsigned int sel = 0;
         int ret;
-        hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1], NULL, NULL };
+        struct ide_hw hw[2], *hws[] = { &hw[0], &hw[1] };
         struct ide_port_info d = icside_v6_port_info;
 
         ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
@@ -506,7 +453,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         icside_setup_ports(&hw[0], easi_base, &icside_cardinfo_v6_1, ec);
         icside_setup_ports(&hw[1], easi_base, &icside_cardinfo_v6_2, ec);
 
-        host = ide_host_alloc(&d, hws);
+        host = ide_host_alloc(&d, hws, 2);
         if (host == NULL)
                 return -ENODEV;