Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / drivers / ide / ide-taskfile.c

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 5f6d01a4222c3122397e480526065be314ab536e..2d63ea9ee61b3c56bb7e02fd2e43170094fa9422 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -114,8 +114,6 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
                hwif->OUTB((tf->device & HIHI) | drive->select.all, IDE_SELECT_REG);
 }
 
-EXPORT_SYMBOL_GPL(ide_tf_load);
-
 int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf)
 {
        ide_task_t args;
@@ -128,13 +126,12 @@ int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf)
                args.tf.command = WIN_PIDENTIFY;
        args.tf_flags   = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
        args.data_phase = TASKFILE_IN;
-       args.handler    = task_in_intr;
        return ide_raw_taskfile(drive, &args, buf, 1);
 }
 
 static int inline task_dma_ok(ide_task_t *task)
 {
-       if (task->tf_flags & IDE_TFLAG_FLAGGED)
+       if (blk_fs_request(task->rq) || (task->tf_flags & IDE_TFLAG_FLAGGED))
                return 1;
 
        switch (task->tf.command) {
@@ -151,10 +148,18 @@ static int inline task_dma_ok(ide_task_t *task)
        return 0;
 }
 
+static ide_startstop_t task_no_data_intr(ide_drive_t *);
+static ide_startstop_t set_geometry_intr(ide_drive_t *);
+static ide_startstop_t recal_intr(ide_drive_t *);
+static ide_startstop_t set_multmode_intr(ide_drive_t *);
+static ide_startstop_t pre_task_out_intr(ide_drive_t *, struct request *);
+static ide_startstop_t task_in_intr(ide_drive_t *);
+
 ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
 {
        ide_hwif_t *hwif        = HWIF(drive);
        struct ide_taskfile *tf = &task->tf;
+       ide_handler_t *handler = NULL;
 
        if (task->data_phase == TASKFILE_MULTI_IN ||
            task->data_phase == TASKFILE_MULTI_OUT) {
@@ -168,7 +173,8 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
        if (task->tf_flags & IDE_TFLAG_FLAGGED)
                task->tf_flags |= IDE_TFLAG_FLAGGED_SET_IN_FLAGS;
 
-       ide_tf_load(drive, task);
+       if ((task->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0)
+               ide_tf_load(drive, task);
 
        switch (task->data_phase) {
        case TASKFILE_MULTI_OUT:
@@ -178,8 +184,21 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
                return pre_task_out_intr(drive, task->rq);
        case TASKFILE_MULTI_IN:
        case TASKFILE_IN:
+               handler = task_in_intr;
+               /* fall-through */
        case TASKFILE_NO_DATA:
-               ide_execute_command(drive, tf->command, task->handler, WAIT_WORSTCASE, NULL);
+               if (handler == NULL)
+                       handler = task_no_data_intr;
+               /* WIN_{SPECIFY,RESTORE,SETMULT} use custom handlers */
+               if (task->tf_flags & IDE_TFLAG_CUSTOM_HANDLER) {
+                       switch (tf->command) {
+                       case WIN_SPECIFY: handler = set_geometry_intr;  break;
+                       case WIN_RESTORE: handler = recal_intr;         break;
+                       case WIN_SETMULT: handler = set_multmode_intr;  break;
+                       }
+               }
+               ide_execute_command(drive, tf->command, handler,
+                                   WAIT_WORSTCASE, NULL);
                return ide_started;
        default:
                if (task_dma_ok(task) == 0 || drive->using_dma == 0 ||
@@ -190,11 +209,12 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
                return ide_started;
        }
 }
+EXPORT_SYMBOL_GPL(do_rw_taskfile);
 
 /*
  * set_multmode_intr() is invoked on completion of a WIN_SETMULT cmd.
  */
-ide_startstop_t set_multmode_intr (ide_drive_t *drive)
+static ide_startstop_t set_multmode_intr(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = HWIF(drive);
        u8 stat;
@@ -212,7 +232,7 @@ ide_startstop_t set_multmode_intr (ide_drive_t *drive)
 /*
  * set_geometry_intr() is invoked on completion of a WIN_SPECIFY cmd.
  */
-ide_startstop_t set_geometry_intr (ide_drive_t *drive)
+static ide_startstop_t set_geometry_intr(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = HWIF(drive);
        int retries = 5;
@@ -235,7 +255,7 @@ ide_startstop_t set_geometry_intr (ide_drive_t *drive)
 /*
  * recal_intr() is invoked on completion of a WIN_RESTORE (recalibrate) cmd.
  */
-ide_startstop_t recal_intr (ide_drive_t *drive)
+static ide_startstop_t recal_intr(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = HWIF(drive);
        u8 stat;
@@ -248,7 +268,7 @@ ide_startstop_t recal_intr (ide_drive_t *drive)
 /*
  * Handler for commands without a data phase
  */
-ide_startstop_t task_no_data_intr (ide_drive_t *drive)
+static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
 {
        ide_task_t *args        = HWGROUP(drive)->rq->special;
        ide_hwif_t *hwif        = HWIF(drive);
@@ -428,7 +448,7 @@ static void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
 /*
  * Handler for command with PIO data-in phase (Read/Read Multiple).
  */
-ide_startstop_t task_in_intr (ide_drive_t *drive)
+static ide_startstop_t task_in_intr(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = drive->hwif;
        struct request *rq = HWGROUP(drive)->rq;
@@ -459,7 +479,6 @@ ide_startstop_t task_in_intr (ide_drive_t *drive)
 
        return ide_started;
 }
-EXPORT_SYMBOL(task_in_intr);
 
 /*
  * Handler for command with PIO data-out phase (Write/Write Multiple).
@@ -489,7 +508,7 @@ static ide_startstop_t task_out_intr (ide_drive_t *drive)
        return ide_started;
 }
 
-ide_startstop_t pre_task_out_intr (ide_drive_t *drive, struct request *rq)
+static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, struct request *rq)
 {
        ide_startstop_t startstop;
 
@@ -510,7 +529,6 @@ ide_startstop_t pre_task_out_intr (ide_drive_t *drive, struct request *rq)
 
        return ide_started;
 }
-EXPORT_SYMBOL(pre_task_out_intr);
 
 int ide_raw_taskfile(ide_drive_t *drive, ide_task_t *task, u8 *buf, u16 nsect)
 {
@@ -544,7 +562,6 @@ EXPORT_SYMBOL(ide_raw_taskfile);
 int ide_no_data_taskfile(ide_drive_t *drive, ide_task_t *task)
 {
        task->data_phase = TASKFILE_NO_DATA;
-       task->handler    = task_no_data_intr;
 
        return ide_raw_taskfile(drive, task, NULL, 0);
 }
@@ -667,7 +684,6 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                        }
                        /* fall through */
                case TASKFILE_OUT:
-                       args.handler = &task_out_intr;
                        /* fall through */
                case TASKFILE_OUT_DMAQ:
                case TASKFILE_OUT_DMA:
@@ -685,7 +701,6 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                        }
                        /* fall through */
                case TASKFILE_IN:
-                       args.handler = &task_in_intr;
                        /* fall through */
                case TASKFILE_IN_DMAQ:
                case TASKFILE_IN_DMA:
@@ -693,7 +708,6 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                        data_buf = inbuf;
                        break;
                case TASKFILE_NO_DATA:
-                       args.handler = &task_no_data_intr;
                        break;
                default:
                        err = -EFAULT;