Browse Source

ide: move ide_read_bcount_and_ireason() to ide-atapi.c

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz 16 years ago
parent
commit
0d6a9754c0
2 changed files with 15 additions and 15 deletions
  1. 15 0
      drivers/ide/ide-atapi.c
  2. 0 15
      drivers/ide/ide-iops.c

+ 15 - 0
drivers/ide/ide-atapi.c

@@ -300,6 +300,21 @@ int ide_cd_get_xferlen(struct request *rq)
 }
 }
 EXPORT_SYMBOL_GPL(ide_cd_get_xferlen);
 EXPORT_SYMBOL_GPL(ide_cd_get_xferlen);
 
 
+void ide_read_bcount_and_ireason(ide_drive_t *drive, u16 *bcount, u8 *ireason)
+{
+	ide_task_t task;
+
+	memset(&task, 0, sizeof(task));
+	task.tf_flags = IDE_TFLAG_IN_LBAH | IDE_TFLAG_IN_LBAM |
+			IDE_TFLAG_IN_NSECT;
+
+	drive->hwif->tp_ops->tf_read(drive, &task);
+
+	*bcount = (task.tf.lbah << 8) | task.tf.lbam;
+	*ireason = task.tf.nsect & 3;
+}
+EXPORT_SYMBOL_GPL(ide_read_bcount_and_ireason);
+
 /*
 /*
  * This is the usual interrupt handler which will be called during a packet
  * This is the usual interrupt handler which will be called during a packet
  * command.  We will transfer some of the data (as requested by the drive)
  * command.  We will transfer some of the data (as requested by the drive)

+ 0 - 15
drivers/ide/ide-iops.c

@@ -362,21 +362,6 @@ u8 ide_read_error(ide_drive_t *drive)
 }
 }
 EXPORT_SYMBOL_GPL(ide_read_error);
 EXPORT_SYMBOL_GPL(ide_read_error);
 
 
-void ide_read_bcount_and_ireason(ide_drive_t *drive, u16 *bcount, u8 *ireason)
-{
-	ide_task_t task;
-
-	memset(&task, 0, sizeof(task));
-	task.tf_flags = IDE_TFLAG_IN_LBAH | IDE_TFLAG_IN_LBAM |
-			IDE_TFLAG_IN_NSECT;
-
-	drive->hwif->tp_ops->tf_read(drive, &task);
-
-	*bcount = (task.tf.lbah << 8) | task.tf.lbam;
-	*ireason = task.tf.nsect & 3;
-}
-EXPORT_SYMBOL_GPL(ide_read_bcount_and_ireason);
-
 const struct ide_tp_ops default_tp_ops = {
 const struct ide_tp_ops default_tp_ops = {
 	.exec_command		= ide_exec_command,
 	.exec_command		= ide_exec_command,
 	.read_status		= ide_read_status,
 	.read_status		= ide_read_status,