Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd2e9a03 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-{floppy,tape}: move checking of ->failed_pc to ->callback 



Move checking/resetting of ->failed_pc from ide*_pc_intr() to ->callback
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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com&gt;--->
parent 6bf1641c

drivers/ide/ide-floppy.c

+3 −2
Original line number Diff line number Diff line
@@ -320,6 +320,9 @@ static void ide_floppy_callback(ide_drive_t *drive) 


	debug_log("Reached %s\n", __func__);



	if (floppy->failed_pc == pc)

		floppy->failed_pc = NULL;



	if (pc->c[0] == GPCMD_READ_10 || pc->c[0] == GPCMD_WRITE_10 ||

	    (pc->rq && blk_pc_request(pc->rq)))

		uptodate = 1; /* FIXME */
@@ -435,8 +438,6 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) 
			return ide_stopped;

		}

		pc->error = 0;

		if (floppy->failed_pc == pc)

			floppy->failed_pc = NULL;

		/* Command finished - Call the callback function */

		pc->callback(drive);

		return ide_stopped;

drivers/ide/ide-tape.c

+3 −4
Original line number Diff line number Diff line
@@ -627,6 +627,9 @@ static void ide_tape_callback(ide_drive_t *drive) 


	debug_log(DBG_PROCS, "Enter %s\n", __func__);



	if (tape->failed_pc == pc)

		tape->failed_pc = NULL;



	if (pc->c[0] == REQUEST_SENSE) {

		if (uptodate)

			idetape_analyze_error(drive, pc->buf);
@@ -838,8 +841,6 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive) 
			idetape_postpone_request(drive);

			return ide_stopped;

		}

		if (tape->failed_pc == pc)

			tape->failed_pc = NULL;

		/* Command finished - Call the callback function */

		pc->callback(drive);

		return ide_stopped;
@@ -1050,8 +1051,6 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive) 
			return ide_stopped;

		}

		pc->error = 0;

		if (tape->failed_pc == pc)

			tape->failed_pc = NULL;

	} else {

		pc->error = IDETAPE_ERROR_GENERAL;

		tape->failed_pc = NULL;