[2.6 patch] fujitsu-laptop.c: remove dead code

[2.6 patch] fujitsu-laptop.c: remove dead code

[Adrian Bunk]

This patch removes dead code spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
--- linux-2.6/drivers/misc/fujitsu-laptop.c.old	2007-10-23 18:51:10.000000000 +0200
+++ linux-2.6/drivers/misc/fujitsu-laptop.c	2007-10-23 18:51:50.000000000 +0200
@@ -110,33 +110,30 @@ static int get_lcd_level(void)
 
 	// Get the Brightness
 	status =
 	    acpi_evaluate_integer(fujitsu->acpi_handle, "GBLL", NULL, &state);
 	if (status < 0)
 		return status;
 
 	fujitsu->fuj02b1_state = state;
 	fujitsu->brightness_level = state & 0x0fffffff;
 
 	if (state & 0x80000000)
 		fujitsu->brightness_changed = 1;
 	else
 		fujitsu->brightness_changed = 0;
 
-	if (status < 0)
-		return status;
-
 	return fujitsu->brightness_level;
 }
 
 /* Backlight device stuff */
 
 static int bl_get_brightness(struct backlight_device *b)
 {
 	return get_lcd_level();
 }
 
 static int bl_update_status(struct backlight_device *b)
 {
 	return set_lcd_level(b->props.brightness);
 }
 

Re: [2.6 patch] fujitsu-laptop.c: remove dead code

[Jonathan Woithe]

> This patch removes dead code spotted by the Coverity checker.
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

Ack.

Signed-off-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>

jonathan

---
--- linux-2.6/drivers/misc/fujitsu-laptop.c.old	2007-10-23 18:51:10.000000000 +0200
+++ linux-2.6/drivers/misc/fujitsu-laptop.c	2007-10-23 18:51:50.000000000 +0200
@@ -110,33 +110,30 @@ static int get_lcd_level(void)
 
 	// Get the Brightness
 	status =
 	    acpi_evaluate_integer(fujitsu->acpi_handle, "GBLL", NULL, &state);
 	if (status < 0)
 		return status;
 
 	fujitsu->fuj02b1_state = state;
 	fujitsu->brightness_level = state & 0x0fffffff;
 
 	if (state & 0x80000000)
 		fujitsu->brightness_changed = 1;
 	else
 		fujitsu->brightness_changed = 0;
 
-	if (status < 0)
-		return status;
-
 	return fujitsu->brightness_level;
 }
 
 /* Backlight device stuff */
 
 static int bl_get_brightness(struct backlight_device *b)
 {
 	return get_lcd_level();
 }
 
 static int bl_update_status(struct backlight_device *b)
 {
 	return set_lcd_level(b->props.brightness);
 }
 

Re: [2.6 patch] fujitsu-laptop.c: remove dead code

[Len Brown]

Applied.

thanks,
-len

On Thursday 25 October 2007 01:08, Jonathan Woithe wrote:
> > This patch removes dead code spotted by the Coverity checker.
> > 
> > Signed-off-by: Adrian Bunk <bunk@kernel.org>
> 
> Ack.
> 
> Signed-off-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
> 
> jonathan
> 
> ---
> --- linux-2.6/drivers/misc/fujitsu-laptop.c.old	2007-10-23 18:51:10.000000000 +0200
> +++ linux-2.6/drivers/misc/fujitsu-laptop.c	2007-10-23 18:51:50.000000000 +0200
> @@ -110,33 +110,30 @@ static int get_lcd_level(void)
>  
>  	// Get the Brightness
>  	status =
>  	    acpi_evaluate_integer(fujitsu->acpi_handle, "GBLL", NULL, &state);
>  	if (status < 0)
>  		return status;
>  
>  	fujitsu->fuj02b1_state = state;
>  	fujitsu->brightness_level = state & 0x0fffffff;
>  
>  	if (state & 0x80000000)
>  		fujitsu->brightness_changed = 1;
>  	else
>  		fujitsu->brightness_changed = 0;
>  
> -	if (status < 0)
> -		return status;
> -
>  	return fujitsu->brightness_level;
>  }
>  
>  /* Backlight device stuff */
>  
>  static int bl_get_brightness(struct backlight_device *b)
>  {
>  	return get_lcd_level();
>  }
>  
>  static int bl_update_status(struct backlight_device *b)
>  {
>  	return set_lcd_level(b->props.brightness);
>  }
>  
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>