From: Borislav Petkov <petkovbb@googlemail.com>
To: bzolnier@gmail.com
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
Borislav Petkov <petkovbb@gmail.com>
Subject: [PATCH 4/8] ide-cd: remove xferlen arg to cdrom_start_packet_command
Date: Thu, 18 Dec 2008 08:40:48 +0100 [thread overview]
Message-ID: <1229586052-3542-5-git-send-email-petkovbb@gmail.com> (raw)
In-Reply-To: <1229586052-3542-1-git-send-email-petkovbb@gmail.com>
There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
---
drivers/ide/ide-cd.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 105e4d8..34981f5 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -520,10 +520,13 @@ end_request:
* will be called immediately after the drive is prepared for the transfer.
*/
static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,
- int xferlen,
ide_handler_t *handler)
{
ide_hwif_t *hwif = drive->hwif;
+ struct request *rq = hwif->hwgroup->rq;
+ int xferlen;
+
+ xferlen = ide_cd_get_xferlen(rq);
ide_debug_log(IDE_DBG_PC, "Call %s, xferlen: %d\n", __func__, xferlen);
@@ -1175,15 +1178,12 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
sector_t block)
{
ide_handler_t *fn;
- int xferlen;
ide_debug_log(IDE_DBG_RQ, "Call %s, rq->cmd[0]: 0x%x, "
"rq->cmd_type: 0x%x, block: %llu\n",
__func__, rq->cmd[0], rq->cmd_type,
(unsigned long long)block);
- xferlen = ide_cd_get_xferlen(rq);
-
if (blk_fs_request(rq)) {
fn = cdrom_start_rw_cont;
@@ -1210,7 +1210,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
return ide_stopped;
}
- return cdrom_start_packet_command(drive, xferlen, fn);
+ return cdrom_start_packet_command(drive, fn);
}
/*
--
1.6.0.4
next prev parent reply other threads:[~2008-12-18 7:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-18 7:40 [PATCH 0/8] ide-cd: first conversion batch Borislav Petkov
2008-12-18 7:40 ` [PATCH 1/8] ide-atapi: compute cmd_len based on device type in ide_transfer_pc Borislav Petkov
2008-12-18 7:40 ` [PATCH 2/8] ide-atapi: assign expiry and timeout based on device type Borislav Petkov
2008-12-21 19:06 ` Bartlomiej Zolnierkiewicz
2008-12-18 7:40 ` [PATCH 3/8] ide-atapi: split drive-specific functionality in ide_issue_pc Borislav Petkov
2008-12-18 7:40 ` Borislav Petkov [this message]
2008-12-18 7:40 ` [PATCH 5/8] ide-cd: remove handler wrappers Borislav Petkov
2008-12-21 19:15 ` Bartlomiej Zolnierkiewicz
2008-12-18 7:40 ` [PATCH 6/8] ide-atapi: remove timeout arg to ide_issue_pc Borislav Petkov
2008-12-18 7:40 ` [PATCH 7/8] ide-atapi: put the rest of non-ide-cd code into the else-clause of ide_transfer_pc Borislav Petkov
2008-12-18 7:40 ` [PATCH 8/8] ide-atapi: start dma in a drive-specific way Borislav Petkov
2008-12-19 20:15 ` [PATCH 0/8] ide-cd: first conversion batch Bartlomiej Zolnierkiewicz
2008-12-19 21:19 ` Borislav Petkov
2008-12-20 6:28 ` Borislav Petkov
2008-12-21 19:05 ` Bartlomiej Zolnierkiewicz
2008-12-26 13:45 ` Borislav Petkov
2008-12-29 18:57 ` Bartlomiej Zolnierkiewicz
2008-12-26 13:46 ` Borislav Petkov
2008-12-26 13:46 ` Borislav Petkov
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=1229586052-3542-5-git-send-email-petkovbb@gmail.com \
--to=petkovbb@googlemail.com \
--cc=bzolnier@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=petkovbb@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).