From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Subject: [PATCH] ide: sanitize ide_finish_cmd()
* Move ide_end_request() call out from ide_finish_cmd() to its users.
* Use ide_finish_cmd() in task_no_data_intr().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
---
drivers/ide/ide-dma.c | 5 ++++-
drivers/ide/ide-taskfile.c | 24 +++++++++---------------
2 files changed, 13 insertions(+), 16 deletions(-)
Index: b/drivers/ide/ide-dma.c
===================================================================
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -98,7 +98,10 @@ ide_startstop_t ide_dma_intr(ide_drive_t
if (!dma_stat) {
struct ide_cmd *cmd = &hwif->cmd;
- ide_finish_cmd(drive, cmd, stat);
+ if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
+ ide_finish_cmd(drive, cmd, stat);
+ else
+ ide_end_request(drive, 1, cmd->rq->nr_sectors);
return ide_stopped;
}
printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
Index: b/drivers/ide/ide-taskfile.c
===================================================================
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -150,12 +150,8 @@ static ide_startstop_t task_no_data_intr
drive->mult_count = drive->mult_req;
if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE ||
- tf->command == ATA_CMD_CHK_POWER) {
- u8 err = ide_read_error(drive);
-
- ide_complete_cmd(drive, cmd, stat, err);
- ide_complete_rq(drive, err);
- }
+ tf->command == ATA_CMD_CHK_POWER)
+ ide_finish_cmd(drive, cmd, stat);
return ide_stopped;
}
@@ -287,15 +283,10 @@ static void ide_error_cmd(ide_drive_t *d
void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
{
- if ((cmd->tf_flags & IDE_TFLAG_FS) == 0) {
- u8 err = ide_read_error(drive);
+ u8 err = ide_read_error(drive);
- ide_complete_cmd(drive, cmd, stat, err);
- ide_complete_rq(drive, err);
- return;
- }
-
- ide_end_request(drive, 1, cmd->rq->nr_sectors);
+ ide_complete_cmd(drive, cmd, stat, err);
+ ide_complete_rq(drive, err);
}
/*
@@ -350,7 +341,10 @@ out_wait:
ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);
return ide_started;
out_end:
- ide_finish_cmd(drive, cmd, stat);
+ if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
+ ide_finish_cmd(drive, cmd, stat);
+ else
+ ide_end_request(drive, 1, cmd->rq->nr_sectors);
return ide_stopped;
out_err:
ide_error_cmd(drive, cmd);
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
