aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 12:46:37 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 12:46:37 +0100
commitb109f526cabcd098131e770fd6232282bce147b4 (patch)
tree09e2d38611226b8683d355de1ec95e5cae38aa53 /drivers/ide
parent03a2faaea8f44edfe583ddf1240948019becfbe4 (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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index f85b7f21a61..15bbfc1dcd2 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,
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)
@@ -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;
@@ -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);