Skip to contentSkip to conversation

fujitsu-laptop.c: remove dead code

PATCH Applied Adrian Bunk 3 participants 3 messages Oct 24, 2007 – Oct 25, 2007 Char and misc drivers

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 fujitsu-laptop.c: remove dead code

This patch removes dead code spotted by the Coverity checker.

Signed-off-by Adrian Bunk <[email protected]>

---

drivers/misc/fujitsu-laptop.c renamed from drivers/misc/fujitsu-laptop.c.old +0 -3
@@ -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);
 }
#1 lore raw
Quoted 3 lines

This patch removes dead code spotted by the Coverity checker.

Signed-off-by Adrian Bunk <[email protected]>

Ack.

Signed-off-by Jonathan Woithe <[email protected]>

jonathan

---

drivers/misc/fujitsu-laptop.c renamed from drivers/misc/fujitsu-laptop.c.old +0 -3
@@ -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);
 }
Applied
#2 lore raw

Applied.

thanks,
-len

Quoted 53 lines · Jonathan Woithe
Quoted 3 lines

This patch removes dead code spotted by the Coverity checker.

Signed-off-by Adrian Bunk <[email protected]>

Ack.

Signed-off-by Jonathan Woithe <[email protected]>

jonathan

---

drivers/misc/fujitsu-laptop.c renamed from drivers/misc/fujitsu-laptop.c.old +0 -4
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/