openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ide-atapi: remove timeout arg to ide_issue_pc 

There should be no functionality change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Borislav Petkov 2009-01-02 16:12:56 +01:00 committed by Bartlomiej Zolnierkiewicz
parent 65a3309e55
commit 28ad91db77
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ide/ide-atapi.c
View File

@ -562,11 +562,12 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
return ide_started; 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; struct ide_atapi_pc *pc;
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
ide_expiry_t *expiry = NULL; ide_expiry_t *expiry = NULL;
unsigned int timeout;
u32 tf_flags; u32 tf_flags;
u16 bcount; 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; tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
bcount = ide_cd_get_xferlen(hwif->hwgroup->rq); bcount = ide_cd_get_xferlen(hwif->hwgroup->rq);
expiry = ide_cd_expiry; expiry = ide_cd_expiry;
timeout = ATAPI_WAIT_PC;
if (drive->dma) if (drive->dma)
drive->dma = !hwif->dma_ops->dma_setup(drive); 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) if (!drive->dma)
pc->flags &= ~PC_FLAG_DMA_OK; 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); ide_pktcmd_tf_load(drive, tf_flags, bcount, drive->dma);

2
drivers/ide/ide-floppy.c
View File

@ -197,7 +197,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,
pc->retries++; 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) void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *pc)

2
drivers/ide/ide-tape.c
View File

@ -694,7 +694,7 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,
pc->retries++; 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. */ /* A mode sense command is used to "sense" tape parameters. */

2
include/linux/ide.h
View File

@ -1250,7 +1250,7 @@ int ide_cd_expiry(ide_drive_t *);
int ide_cd_get_xferlen(struct request *); 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 *); ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);