diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:37 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:37 -0400 |
commit | b109f526cabcd098131e770fd6232282bce147b4 (patch) | |
tree | 09e2d38611226b8683d355de1ec95e5cae38aa53 /drivers/ide | |
parent | 03a2faaea8f44edfe583ddf1240948019becfbe4 (diff) |
ide: use blk_fs_request() check in ide-taskfile.c
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-taskfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index f85b7f21a617..15bbfc1dcd28 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -268,7 +268,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq, | |||
268 | ide_task_t *task = &drive->hwif->task; | 268 | ide_task_t *task = &drive->hwif->task; |
269 | u8 saved_io_32bit = drive->io_32bit; | 269 | u8 saved_io_32bit = drive->io_32bit; |
270 | 270 | ||
271 | if (rq->bio) /* fs request */ | 271 | if (blk_fs_request(rq)) |
272 | rq->errors = 0; | 272 | rq->errors = 0; |
273 | 273 | ||
274 | if (task->tf_flags & IDE_TFLAG_IO_16BIT) | 274 | if (task->tf_flags & IDE_TFLAG_IO_16BIT) |
@@ -292,7 +292,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq, | |||
292 | static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq, | 292 | static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq, |
293 | const char *s, u8 stat) | 293 | const char *s, u8 stat) |
294 | { | 294 | { |
295 | if (rq->bio) { | 295 | if (blk_fs_request(rq)) { |
296 | ide_hwif_t *hwif = drive->hwif; | 296 | ide_hwif_t *hwif = drive->hwif; |
297 | ide_task_t *task = &hwif->task; | 297 | ide_task_t *task = &hwif->task; |
298 | int sectors = hwif->nsect - hwif->nleft; | 298 | int sectors = hwif->nsect - hwif->nleft; |
@@ -323,7 +323,7 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq, | |||
323 | 323 | ||
324 | void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) | 324 | void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) |
325 | { | 325 | { |
326 | if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) { | 326 | if (blk_fs_request(rq) == 0) { |
327 | ide_task_t *task = rq->special; | 327 | ide_task_t *task = rq->special; |
328 | u8 err = ide_read_error(drive); | 328 | u8 err = ide_read_error(drive); |
329 | 329 | ||