[PATCH 01/14] ide: use blk_fs_request() check in ide-taskfile.c

Bartlomiej Zolnierkiewicz
2009-02-02T21:36:36Z

Subject: [PATCH] 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>
---
drivers/ide/ide-taskfile.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Index: b/drivers/ide/ide-taskfile.c
===================================================================
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -264,7 +264,7 @@ static void ide_pio_datablock(ide_drive_
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)
@@ -288,7 +288,7 @@ static void ide_pio_datablock(ide_drive_
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;
@@ -319,7 +319,7 @@ static ide_startstop_t task_error(ide_dr

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);