Commit 1b06e92a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-{floppy,tape}: merge pc->idefloppy_callback and pc->idetape_callback 



Merge pc->idefloppy_callback and pc->idetape_callback into pc->callback.

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>
parent 81f49382

drivers/ide/ide-floppy.c

+3 −3
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void idefloppy_init_pc(struct ide_atapi_pc *pc) 
	pc->req_xfer = 0;

	pc->buf = pc->pc_buf;

	pc->buf_size = IDEFLOPPY_PC_BUFFER_SIZE;

	pc->idefloppy_callback = &ide_floppy_callback;

	pc->callback = ide_floppy_callback;

}



static void idefloppy_create_request_sense_cmd(struct ide_atapi_pc *pc)
@@ -438,7 +438,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) 
		if (floppy->failed_pc == pc)

			floppy->failed_pc = NULL;

		/* Command finished - Call the callback function */

		pc->idefloppy_callback(drive);

		pc->callback(drive);

		return ide_stopped;

	}
@@ -612,7 +612,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, 
		pc->error = IDEFLOPPY_ERROR_GENERAL;



		floppy->failed_pc = NULL;

		pc->idefloppy_callback(drive);

		pc->callback(drive);

		return ide_stopped;

	}

drivers/ide/ide-tape.c

+4 −4
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static void idetape_init_pc(struct ide_atapi_pc *pc) 
	pc->buf_size = IDETAPE_PC_BUFFER_SIZE;

	pc->bh = NULL;

	pc->b_data = NULL;

	pc->idetape_callback = ide_tape_callback;

	pc->callback = ide_tape_callback;

}



static void idetape_create_request_sense_cmd(struct ide_atapi_pc *pc)
@@ -841,7 +841,7 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive) 
		if (tape->failed_pc == pc)

			tape->failed_pc = NULL;

		/* Command finished - Call the callback function */

		pc->idetape_callback(drive);

		pc->callback(drive);

		return ide_stopped;

	}
@@ -1034,7 +1034,7 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive, 
			pc->error = IDETAPE_ERROR_GENERAL;

		}

		tape->failed_pc = NULL;

		pc->idetape_callback(drive);

		pc->callback(drive);

		return ide_stopped;

	}

	debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);
@@ -1120,7 +1120,7 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive) 
		pc->error = IDETAPE_ERROR_GENERAL;

		tape->failed_pc = NULL;

	}

	pc->idetape_callback(drive);

	pc->callback(drive);

	return ide_stopped;

}

include/linux/ide.h

+2 −2
Original line number Diff line number Diff line
@@ -640,8 +640,8 @@ struct ide_atapi_pc { 
	 * to change/removal later.

	 */

	u8 pc_buf[256];

	void (*idefloppy_callback) (ide_drive_t *);

	void (*idetape_callback) (ide_drive_t *);



	void (*callback)(ide_drive_t *);



	/* idetape only */

	struct idetape_bh *bh;