From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-ide@vger.kernel.org
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 14/14] ide: sanitize ide_finish_cmd()
Date: Mon, 02 Feb 2009 22:40:29 +0100 [thread overview]
Message-ID: <20090202214029.17960.54823.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090202213707.17960.61897.sendpatchset@localhost.localdomain>
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
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@gmail.com>
---
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);
prev parent reply other threads:[~2009-02-02 21:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-02 21:37 [PATCH 00/14] ide: ide_task_t -> struct ide_cmd Bartlomiej Zolnierkiewicz
2009-02-02 21:37 ` [PATCH 01/14] ide: use blk_fs_request() check in ide-taskfile.c Bartlomiej Zolnierkiewicz
2009-02-02 21:37 ` [PATCH 02/14] ide: call ide_build_sglist() prior to ->dma_setup Bartlomiej Zolnierkiewicz
2009-02-02 21:37 ` [PATCH 03/14] ide: remove ide_task_t typedef Bartlomiej Zolnierkiewicz
2009-02-02 21:37 ` [PATCH 04/14] ide: pass command instead of request to ide_pio_datablock() Bartlomiej Zolnierkiewicz
2009-02-02 21:37 ` [PATCH 05/14] ide: move command related fields from ide_hwif_t to struct ide_cmd Bartlomiej Zolnierkiewicz
2009-02-02 21:37 ` [PATCH 06/14] ide: set IDE_TFLAG_WRITE basing on data phase used in ide_taskfile_ioctl() Bartlomiej Zolnierkiewicz
2009-02-02 21:37 ` [PATCH 07/14] ide: use ata_tf_protocols enums Bartlomiej Zolnierkiewicz
2009-02-02 21:38 ` [PATCH 08/14] ide: merge task_{in,out}_intr() Bartlomiej Zolnierkiewicz
2009-02-02 21:38 ` [PATCH 09/14] ide: inline task_in_unexpected() into task_pio_intr() Bartlomiej Zolnierkiewicz
2009-02-02 21:38 ` [PATCH 10/14] ide: unify exit paths in task_pio_intr() Bartlomiej Zolnierkiewicz
2009-02-02 21:40 ` [PATCH 11/14] ide: task_error() -> task_error_cmd() Bartlomiej Zolnierkiewicz
2009-02-02 21:40 ` [PATCH 12/14] ide: use ide_complete_cmd() for head unload commands Bartlomiej Zolnierkiewicz
2009-02-02 21:40 ` [PATCH 13/14] ide: use ide_complete_cmd() for PM commands Bartlomiej Zolnierkiewicz
2009-02-02 21:40 ` Bartlomiej Zolnierkiewicz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090202214029.17960.54823.sendpatchset@localhost.localdomain \
--to=bzolnier@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).