From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: [PATCH 17/18] ide-floppy: cleanup idefloppy_create_rw_cmd Date: Thu, 12 Jun 2008 08:41:09 +0200 Message-ID: <1213252870-20474-18-git-send-email-petkovbb@gmail.com> References: <1213252870-20474-1-git-send-email-petkovbb@gmail.com> Return-path: Received: from fg-out-1718.google.com ([72.14.220.158]:8289 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753826AbYFLGlK (ORCPT ); Thu, 12 Jun 2008 02:41:10 -0400 Received: by fg-out-1718.google.com with SMTP id 19so2381796fgg.17 for ; Wed, 11 Jun 2008 23:41:09 -0700 (PDT) In-Reply-To: <1213252870-20474-1-git-send-email-petkovbb@gmail.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: bzolnier@gmail.com Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, Borislav Petkov There should be no functionality change introduced by this patch. Signed-off-by: Borislav Petkov --- 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