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 11/14] ide: task_error() -> task_error_cmd()
Date: Mon, 02 Feb 2009 22:40:00 +0100 [thread overview]
Message-ID: <20090202214000.17960.75917.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090202213707.17960.61897.sendpatchset@localhost.localdomain>
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] ide: task_error() -> task_error_cmd()
* Move ide_error() call from task_error() to task_pio_intr()
(the only user).
* Drop no longer used arguments from task_error().
* Rename task_error() to ide_error_cmd().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-taskfile.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Index: b/drivers/ide/ide-taskfile.c
===================================================================
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -276,8 +276,7 @@ static void ide_pio_datablock(ide_drive_
drive->io_32bit = saved_io_32bit;
}
-static ide_startstop_t task_error(ide_drive_t *drive, struct ide_cmd *cmd,
- const char *s, u8 stat)
+static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
{
if (cmd->tf_flags & IDE_TFLAG_FS) {
int sectors = cmd->nsect - cmd->nleft;
@@ -293,7 +292,6 @@ static ide_startstop_t task_error(ide_dr
if (sectors > 0)
ide_end_request(drive, 1, sectors);
}
- return ide_error(drive, s, stat);
}
void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
@@ -364,7 +362,8 @@ out_end:
ide_finish_cmd(drive, cmd, stat);
return ide_stopped;
out_err:
- return task_error(drive, cmd, __func__, stat);
+ ide_error_cmd(drive, cmd);
+ return ide_error(drive, __func__, stat);
}
static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
next 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 ` Bartlomiej Zolnierkiewicz [this message]
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 ` [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=20090202214000.17960.75917.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