ide: factor out debugging code from ide_tf_load()

Factor out debugging code from ide_tf_load() to ide_tf_dump() helper
and update ide_tf_load() users accordingly.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c32ca769b9639d6bd6c8cbd269dbe89ac44e6a49..a6f2186773faa9a50123de3a0e34932985af1490 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1680,6 +1680,7 @@ void ide_pktcmd_tf_load(ide_drive_t *drive, u32 tf_flags, u16 bcount, u8 dma)
        task.tf.lbam    = bcount & 0xff;
        task.tf.lbah    = (bcount >> 8) & 0xff;
 
+       ide_tf_dump(drive->name, &task.tf);
        ide_tf_load(drive, &task);
 }
 

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 0321884f9d921a68d009ccef7d7cc0e0c2013005..416ce54af7ad60f565e41db463a3f41f1d1b30fc 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -33,26 +33,29 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
+void ide_tf_dump(const char *s, struct ide_taskfile *tf)
 {
-       ide_hwif_t *hwif = drive->hwif;
-       struct ide_io_ports *io_ports = &hwif->io_ports;
-       struct ide_taskfile *tf = &task->tf;
-       u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;
-
-       if (task->tf_flags & IDE_TFLAG_FLAGGED)
-               HIHI = 0xFF;
-
 #ifdef DEBUG
        printk("%s: tf: feat 0x%02x nsect 0x%02x lbal 0x%02x "
                "lbam 0x%02x lbah 0x%02x dev 0x%02x cmd 0x%02x\n",
-               drive->name, tf->feature, tf->nsect, tf->lbal,
+               s, tf->feature, tf->nsect, tf->lbal,
                tf->lbam, tf->lbah, tf->device, tf->command);
        printk("%s: hob: nsect 0x%02x lbal 0x%02x "
                "lbam 0x%02x lbah 0x%02x\n",
-               drive->name, tf->hob_nsect, tf->hob_lbal,
+               s, tf->hob_nsect, tf->hob_lbal,
                tf->hob_lbam, tf->hob_lbah);
 #endif
+}
+
+void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
+{
+       ide_hwif_t *hwif = drive->hwif;
+       struct ide_io_ports *io_ports = &hwif->io_ports;
+       struct ide_taskfile *tf = &task->tf;
+       u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;
+
+       if (task->tf_flags & IDE_TFLAG_FLAGGED)
+               HIHI = 0xFF;
 
        ide_set_irq(drive, 1);
 
@@ -149,8 +152,10 @@ 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;
 
-       if ((task->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0)
+       if ((task->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0) {
+               ide_tf_dump(drive->name, tf);
                ide_tf_load(drive, task);
+       }
 
        switch (task->data_phase) {
        case TASKFILE_MULTI_OUT:

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 3927996d2f82c29a48a17abfd6509ff6c45870dc..d7d8bb69db4b08ff9b821590b0175ac7927db409 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -960,6 +960,8 @@ typedef struct ide_task_s {
        void                    *special;       /* valid_t generally */
 } ide_task_t;
 
+void ide_tf_dump(const char *, struct ide_taskfile *);
+
 void ide_tf_load(ide_drive_t *, ide_task_t *);
 void ide_tf_read(ide_drive_t *, ide_task_t *);