[PATCH 33/40] ide-tape: factor out DSC handling from idetape_pc_intr()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Bartlomiej Zolnierkiewicz
Date: Sunday, May 18, 2008 - 11:59 am

Factor out DSC handling from idetape_pc_intr() to ide_tape_handle_dsc()
helper as a preparation for adding generic ide_pc_intr() helper.

There should be no functional changes caused by this patch.

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/ide-tape.c |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

Index: b/drivers/ide/ide-tape.c
===================================================================
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -768,6 +768,18 @@ static void idetape_postpone_request(ide
 	ide_stall_queue(drive, tape->dsc_poll_freq);
 }
 
+static void ide_tape_handle_dsc(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	/* Media access command */
+	tape->dsc_polling_start = jiffies;
+	tape->dsc_poll_freq = IDETAPE_DSC_MA_FAST;
+	tape->dsc_timeout = jiffies + IDETAPE_DSC_MA_TIMEOUT;
+	/* Allow ide.c to handle other requests */
+	idetape_postpone_request(drive);
+}
+
 typedef void idetape_io_buf(ide_drive_t *, struct ide_atapi_pc *, unsigned int);
 
 /*
@@ -833,12 +845,7 @@ static ide_startstop_t idetape_pc_intr(i
 		pc->error = 0;
 		if ((pc->flags & PC_FLAG_WAIT_FOR_DSC) &&
 		    (stat & SEEK_STAT) == 0) {
-			/* Media access command */
-			tape->dsc_polling_start = jiffies;
-			tape->dsc_poll_freq = IDETAPE_DSC_MA_FAST;
-			tape->dsc_timeout = jiffies + IDETAPE_DSC_MA_TIMEOUT;
-			/* Allow ide.c to handle other requests */
-			idetape_postpone_request(drive);
+			ide_tape_handle_dsc(drive);
 			return ide_stopped;
 		}
 		/* Command finished - Call the callback function */
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/40] ide: generic ATAPI support, Bartlomiej Zolnierki ..., (Sun May 18, 11:54 am)
[PATCH 01/40] ide-scsi: fix race in idescsi_transfer_pc(), Bartlomiej Zolnierki ..., (Sun May 18, 11:54 am)
[PATCH 02/40] ide-scsi: fix DRQ checking for DMA transfers ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:54 am)
[PATCH 03/40] ide-scsi: fix handling of DMA errors in ides ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:54 am)
[PATCH 04/40] ide-scsi: fix Interrupt Reason checking in i ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:55 am)
[PATCH 05/40] ide-scsi: merge idescsi_input_buffers() and ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:55 am)
[PATCH 06/40] ide-scsi: remove superfluous BUG_ON() from i ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:55 am)
[PATCH 07/40] ide-scsi: add debug_log() macro, Bartlomiej Zolnierki ..., (Sun May 18, 11:55 am)
[PATCH 08/40] ide-tape: idetape_pc_intr() should use local ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:55 am)
[PATCH 09/40] ide-tape: remove superfluous error message f ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:55 am)
[PATCH 10/40] ide-tape: remove superfluous warning message ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:55 am)
[PATCH 11/40] ide-tape: remove unneeded CONFIG_BLK_DEV_IDE ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:56 am)
[PATCH 12/40] ide-tape: remove stale comments from idetape ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:56 am)
[PATCH 13/40] ide-tape: remove SIMULATE_ERRORS debug code, Bartlomiej Zolnierki ..., (Sun May 18, 11:56 am)
[PATCH 14/40] ide-floppy: merge idefloppy_transfer_pc() an ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:56 am)
[PATCH 15/40] ide-{floppy,tape,scsi}: log device name inst ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:56 am)
[PATCH 16/40] ide-tape: make idetape_retry_pc() void, Bartlomiej Zolnierki ..., (Sun May 18, 11:56 am)
[PATCH 17/40] ide-tape: merge callbacks, Bartlomiej Zolnierki ..., (Sun May 18, 11:57 am)
[PATCH 18/40] ide-tape: make pc-&gt;idetape_callback void, Bartlomiej Zolnierki ..., (Sun May 18, 11:57 am)
[PATCH 19/40] ide-floppy: merge callbacks, Bartlomiej Zolnierki ..., (Sun May 18, 11:57 am)
[PATCH 20/40] ide-{floppy,tape}: merge pc-&gt;idefloppy_callb ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:57 am)
[PATCH 21/40] ide-{floppy,tape}: PC_FLAG_DMA_RECOMMENDED - ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:57 am)
[PATCH 22/40] ide-floppy: start DMA engine in idefloppy_tr ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:57 am)
[PATCH 23/40] ide-tape: set PC_FLAG_DMA_IN_PROGRESS flag i ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:57 am)
[PATCH 24/40] ide-tape: factor out waiting for good ireaso ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:58 am)
[PATCH 25/40] ide: add PC_FLAG_ZIP_DRIVE pc flag, Bartlomiej Zolnierki ..., (Sun May 18, 11:58 am)
[PATCH 26/40] ide-{cd,floppy,tape}: remove checking for dr ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:58 am)
[PATCH 27/40] ide-scsi: set drive-&gt;scsi flag for devices h ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:58 am)
[PATCH 28/40] ide: add ide_transfer_pc() helper, Bartlomiej Zolnierki ..., (Sun May 18, 11:58 am)
[PATCH 29/40] ide-scsi: move idescsi_map_sg() call out fro ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:58 am)
[PATCH 30/40] ide: add PC_FLAG_DRQ_INTERRUPT pc flag, Bartlomiej Zolnierki ..., (Sun May 18, 11:58 am)
[PATCH 31/40] ide: add ide_issue_pc() helper, Bartlomiej Zolnierki ..., (Sun May 18, 11:59 am)
[PATCH 32/40] ide-{floppy,tape}: move checking of -&gt;failed ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:59 am)
[PATCH 33/40] ide-tape: factor out DSC handling from ideta ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:59 am)
[PATCH 34/40] ide-tape: add ide_tape_io_buffers() helper, Bartlomiej Zolnierki ..., (Sun May 18, 11:59 am)
[PATCH 35/40] ide-tape: always log debug info in idetape_p ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:59 am)
[PATCH 36/40] ide-floppy: add more debugging to idefloppy_ ..., Bartlomiej Zolnierki ..., (Sun May 18, 11:59 am)
[PATCH 37/40] ide-scsi: use pc-&gt;callback, Bartlomiej Zolnierki ..., (Sun May 18, 12:00 pm)
[PATCH 38/40] ide-scsi: add more debugging to idescsi_pc_i ..., Bartlomiej Zolnierki ..., (Sun May 18, 12:00 pm)
[PATCH 39/40] ide-{floppy,scsi}: read Status Register befo ..., Bartlomiej Zolnierki ..., (Sun May 18, 12:00 pm)
[PATCH 40/40] ide: add ide_pc_intr() helper, Bartlomiej Zolnierki ..., (Sun May 18, 12:00 pm)
Re: [PATCH 04/40] ide-scsi: fix Interrupt Reason checking ..., Borislav Petkov, (Sun May 18, 10:10 pm)
Re: [PATCH 00/40] ide: generic ATAPI support, Borislav Petkov, (Thu May 22, 12:43 am)
Re: [PATCH 00/40] ide: generic ATAPI support, Bartlomiej Zolnierki ..., (Sun May 25, 6:23 am)
Re: [PATCH 04/40] ide-scsi: fix Interrupt Reason checking ..., Bartlomiej Zolnierki ..., (Tue May 27, 11:30 am)
Re: [PATCH 14/40] ide-floppy: merge idefloppy_transfer_pc( ..., Bartlomiej Zolnierki ..., (Tue May 27, 11:57 am)
Re: [PATCH 22/40] ide-floppy: start DMA engine in ideflopp ..., Bartlomiej Zolnierki ..., (Tue May 27, 11:58 am)
Re: [PATCH 14/40] ide-floppy: merge idefloppy_transfer_pc( ..., Bartlomiej Zolnierki ..., (Thu May 29, 4:01 pm)