Skip to content

Commit

Permalink
ide: use blk_fs_request() check in ide-taskfile.c
Browse files Browse the repository at this point in the history
Use blk_fs_request() in ide-taskfile.c instead of checking for:
- rq->bio in ide_pio_datablock() and task_error()
- rq->cmd_type == REQ_TYPE_ATA_TASKFILE in task_end_request()

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Mar 27, 2009
1 parent 03a2faa commit b109f52
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/ide/ide-taskfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq,
ide_task_t *task = &drive->hwif->task;
u8 saved_io_32bit = drive->io_32bit;

if (rq->bio) /* fs request */
if (blk_fs_request(rq))
rq->errors = 0;

if (task->tf_flags & IDE_TFLAG_IO_16BIT)
Expand All @@ -292,7 +292,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq,
static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq,
const char *s, u8 stat)
{
if (rq->bio) {
if (blk_fs_request(rq)) {
ide_hwif_t *hwif = drive->hwif;
ide_task_t *task = &hwif->task;
int sectors = hwif->nsect - hwif->nleft;
Expand Down Expand Up @@ -323,7 +323,7 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq,

void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
{
if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
if (blk_fs_request(rq) == 0) {
ide_task_t *task = rq->special;
u8 err = ide_read_error(drive);

Expand Down

0 comments on commit b109f52

Please sign in to comment.