diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-07-15 15:21:51 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:51 -0400 |
commit | 63f5abb0959337db0d5bece9cefba03cdcadec51 (patch) | |
tree | 908862cbb739d6571fab4b24f264d4d3671e6400 /drivers/scsi/ide-scsi.c | |
parent | 7e12ca11d65f4cb29ed58ea3948f8c5d4f57b35e (diff) |
ide: remove action argument in ide_do_drive_cmd
ide_do_drive_cmd is called only with ide_preempt action argument. So
we can remove the action argument in ide_do_drive_cmd and ide_action_t
typedef.
This patch also includes two minor cleanups: 1) ide_do_drive_cmd
always succeeds so we don't need the return value; 2) the callers use
blk_rq_init before ide_do_drive_cmd so there is no need to initialize
rq->errors.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/scsi/ide-scsi.c')
-rw-r--r-- | drivers/scsi/ide-scsi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index 58e30efe7a74..569ffde6d047 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c | |||
@@ -245,7 +245,8 @@ static int idescsi_check_condition(ide_drive_t *drive, | |||
245 | ide_scsi_hex_dump(pc->c, 6); | 245 | ide_scsi_hex_dump(pc->c, 6); |
246 | } | 246 | } |
247 | rq->rq_disk = scsi->disk; | 247 | rq->rq_disk = scsi->disk; |
248 | return ide_do_drive_cmd(drive, rq, ide_preempt); | 248 | ide_do_drive_cmd(drive, rq); |
249 | return 0; | ||
249 | } | 250 | } |
250 | 251 | ||
251 | static int idescsi_end_request(ide_drive_t *, int, int); | 252 | static int idescsi_end_request(ide_drive_t *, int, int); |