[PATCH 17/18] ide-floppy: cleanup idefloppy_create_rw_cmd

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Borislav Petkov
Date: Wednesday, June 11, 2008 - 11:41 pm

There should be no functionality change introduced by this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
---
 drivers/ide/ide-floppy.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 1ec4951..8bdef60 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -576,8 +576,7 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
 	int blocks = rq->nr_sectors / floppy->bs_factor;
 	int rw_dir = rq_data_dir(rq);
 
-	debug_log("create_rw10_cmd: block == %d, blocks == %d\n",
-		  block, blocks);
+	debug_log("%s: block == %d, blocks == %d\n", __func__, block, blocks);
 
 	idefloppy_init_pc(pc, NULL);
 	rq->cmd[0] = rw_dir == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
@@ -586,8 +585,10 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
 
 	pc->rq = rq;
 	pc->b_count = rw_dir == READ ? 0 : rq->bio->bi_size;
-	if (rq->cmd_flags & REQ_RW)
+
+	if (rw_dir)
 		pc->flags |= PC_FLAG_WRITING;
+
 	pc->buf = NULL;
 	pc->req_xfer = pc->buf_size = blocks * floppy->block_size;
 	pc->flags |= PC_FLAG_DMA_OK;
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/18] misc generic ide stuff, Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 01/18] ide-cd: remove wait-for-idle-controller bit ..., Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 07/18] ide-cd: mv ide_do_rw_cdrom ide_cd_do_request, Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 08/18] ide-cd: simplify request issuing path, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 17/18] ide-floppy: cleanup idefloppy_create_rw_cmd, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 18/18] ide: use flags in IRQ handler, Borislav Petkov, (Wed Jun 11, 11:41 pm)
Re: [PATCH 00/18] misc generic ide stuff, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 02/18] ide-cd: remove ide_cd_drain_data and ide ..., Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:40 am)
Re: [PATCH 18/18] ide: use flags in IRQ handler, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:47 am)
Re: [PATCH 00/18] misc generic ide stuff, Borislav Petkov, (Sun Jun 15, 3:27 am)
Re: [PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Bartlomiej Zolnierki ..., (Sun Jun 15, 7:57 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Borislav Petkov, (Fri Aug 15, 12:34 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Borislav Petkov, (Fri Aug 15, 12:34 am)