Use the fact that for the first loop rq->current_nr_sectors is always
set and unify moving to the next buffer for read/write requests.
There should be no functionality changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
-46 bytes
drivers/ide/ide-cd.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
Index: b/drivers/ide/ide-cd.c
===================================================================
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1287,13 +1287,6 @@ static ide_startstop_t cdrom_rw_intr(ide
while (sectors_to_transfer > 0) {
int this_transfer;
- /*
- * If we've filled the present buffer but there's another
- * chained buffer after it, move on.
- */
- if (!write && rq->current_nr_sectors == 0 && rq->nr_sectors)
- cdrom_end_request(drive, 1);
-
if (!rq->current_nr_sectors) {
if (!write)
/*
@@ -1327,7 +1320,7 @@ static ide_startstop_t cdrom_rw_intr(ide
/*
* current buffer complete, move on
*/
- if (write && rq->current_nr_sectors == 0 && rq->nr_sectors)
+ if (rq->current_nr_sectors == 0 && rq->nr_sectors)
cdrom_end_request(drive, 1);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
