Commit 28ad91db authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-atapi: remove timeout arg to ide_issue_pc 



There should be no functionality change resulting from this patch.

Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 65a3309e

drivers/ide/ide-atapi.c

+6 −1
Original line number Diff line number Diff line
@@ -562,11 +562,12 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) 
	return ide_started;

}



ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout)

ide_startstop_t ide_issue_pc(ide_drive_t *drive)

{

	struct ide_atapi_pc *pc;

	ide_hwif_t *hwif = drive->hwif;

	ide_expiry_t *expiry = NULL;

	unsigned int timeout;

	u32 tf_flags;

	u16 bcount;
@@ -574,6 +575,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout) 
		tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;

		bcount = ide_cd_get_xferlen(hwif->hwgroup->rq);

		expiry = ide_cd_expiry;

		timeout = ATAPI_WAIT_PC;



		if (drive->dma)

			drive->dma = !hwif->dma_ops->dma_setup(drive);
@@ -600,6 +602,9 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout) 


		if (!drive->dma)

			pc->flags &= ~PC_FLAG_DMA_OK;



		timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD

						       : WAIT_TAPE_CMD;

	}



	ide_pktcmd_tf_load(drive, tf_flags, bcount, drive->dma);

drivers/ide/ide-floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, 


	pc->retries++;



	return ide_issue_pc(drive, WAIT_FLOPPY_CMD);

	return ide_issue_pc(drive);

}



void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *pc)

drivers/ide/ide-tape.c

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive, 


	pc->retries++;



	return ide_issue_pc(drive, WAIT_TAPE_CMD);

	return ide_issue_pc(drive);

}



/* A mode sense command is used to "sense" tape parameters. */

include/linux/ide.h

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ int ide_cd_expiry(ide_drive_t *); 


int ide_cd_get_xferlen(struct request *);



ide_startstop_t ide_issue_pc(ide_drive_t *, unsigned int);

ide_startstop_t ide_issue_pc(ide_drive_t *);



ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);