From: Borislav Petkov <petkovbb@googlemail.com>
Date: Wed, 16 Jul 2008 18:33:45 +0000 (+0200)
Subject: ide-cd: remove wait-for-idle-controller bit in cdrom_start_packet_command
X-Git-Tag: v2.6.27-rc1~1049^2~21
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=af6765ce9f535f20e6f9975269660fe49594745a;p=linux-2.6-omap-h63xx.git

ide-cd: remove wait-for-idle-controller bit in cdrom_start_packet_command

This is done in the request issue path anyway.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index e12d6027821..eb4b27548ca 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -517,14 +517,9 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,
 						  int xferlen,
 						  ide_handler_t *handler)
 {
-	ide_startstop_t startstop;
 	struct cdrom_info *info = drive->driver_data;
 	ide_hwif_t *hwif = drive->hwif;
 
-	/* wait for the controller to be idle */
-	if (ide_wait_stat(&startstop, drive, 0, BUSY_STAT, WAIT_READY))
-		return startstop;
-
 	/* FIXME: for Virtual DMA we must check harder */
 	if (info->dma)
 		info->dma = !hwif->dma_ops->dma_setup(drive);