Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / drivers / ide / arm / icside.c

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index a90f41e..8a1c27f 100644 (file)
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -6,7 +6,6 @@
  * Please note that this platform does not support 32-bit IDE IO.
  */
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/ioport.h>
@@ -397,35 +396,6 @@ static void icside_dma_start(ide_drive_t *drive)
        enable_dma(hwif->hw.dma);
 }
 
-/*
- * dma_intr() is the handler for disk read/write DMA interrupts
- */
-static ide_startstop_t icside_dmaintr(ide_drive_t *drive)
-{
-       unsigned int stat;
-       int dma_stat;
-
-       dma_stat = icside_dma_end(drive);
-       stat = HWIF(drive)->INB(IDE_STATUS_REG);
-       if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | DRQ_STAT)) {
-               if (!dma_stat) {
-                       struct request *rq = HWGROUP(drive)->rq;
-                       int i;
-
-                       for (i = rq->nr_sectors; i > 0; ) {
-                               i -= rq->current_nr_sectors;
-                               DRIVER(drive)->end_request(drive, 1, rq->nr_sectors);
-                       }
-
-                       return ide_stopped;
-               }
-               printk(KERN_ERR "%s: bad DMA status (dma_stat=%x)\n",
-                      drive->name, dma_stat);
-       }
-
-       return DRIVER(drive)->error(drive, __FUNCTION__, stat);
-}
-
 static int icside_dma_setup(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = HWIF(drive);
@@ -474,7 +444,7 @@ static int icside_dma_setup(ide_drive_t *drive)
 static void icside_dma_exec_cmd(ide_drive_t *drive, u8 cmd)
 {
        /* issue cmd to drive */
-       ide_execute_command(drive, cmd, icside_dmaintr, 2*WAIT_CMD, NULL);
+       ide_execute_command(drive, cmd, ide_dma_intr, 2 * WAIT_CMD, NULL);
 }
 
 static int icside_dma_test_irq(ide_drive_t *drive)
@@ -742,7 +712,7 @@ static int __devinit
 icside_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
        struct icside_state *state;
-       void *idmem;
+       void __iomem *idmem;
        int ret;
 
        ret = ecard_request_resources(ec);