[2.6 patch] drivers/cdrom/gscd.c: kill dead code

[2.6 patch] drivers/cdrom/gscd.c: kill dead code

[Adrian Bunk]

This patch removes some obviously dead code found by the Coverity 
checker.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.12-rc1-mm1-full/drivers/cdrom/gscd.c.old	2005-03-22 20:58:54.000000000 +0100
+++ linux-2.6.12-rc1-mm1-full/drivers/cdrom/gscd.c	2005-03-22 20:59:46.000000000 +0100
@@ -694,12 +694,8 @@
 		do {
 			result = wait_drv_ready();
 		} while (result != 6 || result == 0x0E);
 
-		if (result != 6) {
-			cmd_end();
-			return;
-		}
 #ifdef GSCD_DEBUG
 		printk("LOC_191 ");
 #endif
 

Re: [2.6 patch] drivers/cdrom/gscd.c: kill dead code

[Andreas Schwab]

Adrian Bunk <bunk@stusta.de> writes:

> This patch removes some obviously dead code found by the Coverity 
> checker.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> --- linux-2.6.12-rc1-mm1-full/drivers/cdrom/gscd.c.old	2005-03-22 20:58:54.000000000 +0100
> +++ linux-2.6.12-rc1-mm1-full/drivers/cdrom/gscd.c	2005-03-22 20:59:46.000000000 +0100
> @@ -694,12 +694,8 @@
>  		do {
>  			result = wait_drv_ready();
>  		} while (result != 6 || result == 0x0E);
>  
> -		if (result != 6) {
> -			cmd_end();
> -			return;
> -		}

I'd rather guess that (result != 6 || result == 0x0E) is borken, since
it's equivalent to (result != 6).

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [2.6 patch] drivers/cdrom/gscd.c: kill dead code

[Adrian Bunk]

On Tue, Mar 22, 2005 at 11:46:20PM +0100, Andreas Schwab wrote:
> Adrian Bunk <bunk@stusta.de> writes:
> 
> > This patch removes some obviously dead code found by the Coverity 
> > checker.
> >
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> >
> > --- linux-2.6.12-rc1-mm1-full/drivers/cdrom/gscd.c.old	2005-03-22 20:58:54.000000000 +0100
> > +++ linux-2.6.12-rc1-mm1-full/drivers/cdrom/gscd.c	2005-03-22 20:59:46.000000000 +0100
> > @@ -694,12 +694,8 @@
> >  		do {
> >  			result = wait_drv_ready();
> >  		} while (result != 6 || result == 0x0E);
> >  
> > -		if (result != 6) {
> > -			cmd_end();
> > -			return;
> > -		}
> 
> I'd rather guess that (result != 6 || result == 0x0E) is borken, since
> it's equivalent to (result != 6).

This driver seems to be pretty unchanged for the last 10 years.

Unless someone really knows your assumption was correct, I'd prefer 
staying with the old behavior.

> Andreas.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed