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 13/14] ide: use ide_complete_cmd() for PM commands
Date: Mon, 02 Feb 2009 22:40:23 +0100 [thread overview]
Message-ID: <20090202214023.17960.77399.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090202213707.17960.61897.sendpatchset@localhost.localdomain>
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] ide: use ide_complete_cmd() for PM commands
* Fixup ->tf_flags in ide_do_park_unpark() and ide_start_power_step()
to match their current use.
* Use ide_complete_cmd() for PM commands using ATA_PROT_NODATA.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-park.c | 4 ++--
drivers/ide/ide-pm.c | 2 +-
drivers/ide/ide-taskfile.c | 8 +++-----
3 files changed, 6 insertions(+), 8 deletions(-)
Index: b/drivers/ide/ide-park.c
===================================================================
--- a/drivers/ide/ide-park.c
+++ b/drivers/ide/ide-park.c
@@ -74,11 +74,11 @@ ide_startstop_t ide_do_park_unpark(ide_d
tf->lbal = 0x4c;
tf->lbam = 0x4e;
tf->lbah = 0x55;
- cmd.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER;
} else /* cmd == REQ_UNPARK_HEADS */
tf->command = ATA_CMD_CHK_POWER;
- cmd.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+ cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE |
+ IDE_TFLAG_CUSTOM_HANDLER;
cmd.protocol = ATA_PROT_NODATA;
cmd.rq = rq;
Index: b/drivers/ide/ide-pm.c
===================================================================
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -163,7 +163,7 @@ ide_startstop_t ide_start_power_step(ide
return ide_stopped;
out_do_tf:
- cmd->tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+ cmd->tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
cmd->protocol = ATA_PROT_NODATA;
return do_rw_taskfile(drive, cmd);
Index: b/drivers/ide/ide-taskfile.c
===================================================================
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -149,13 +149,11 @@ static ide_startstop_t task_no_data_intr
if (custom && tf->command == ATA_CMD_SET_MULTI)
drive->mult_count = drive->mult_req;
- if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE) {
- struct request *rq = hwif->rq;
+ if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE ||
+ tf->command == ATA_CMD_CHK_POWER) {
u8 err = ide_read_error(drive);
- if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE ||
- tf->command == ATA_CMD_IDLEIMMEDIATE)
- ide_complete_cmd(drive, cmd, stat, err);
+ ide_complete_cmd(drive, cmd, stat, err);
ide_complete_rq(drive, err);
}
next prev parent reply other threads:[~2009-02-02 21:41 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 ` Bartlomiej Zolnierkiewicz [this message]
2009-02-02 21:40 ` [PATCH 14/14] ide: sanitize ide_finish_cmd() Bartlomiej Zolnierkiewicz
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=20090202214023.17960.77399.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