Skip to contentSkip to conversation

hp-wmi: Fix warnings

PATCH In review Larry Finger 2 participants 2 messages Nov 2, 2008 – Nov 11, 2008 Char and misc drivers

lore
Share & tools
lore

Larry Finger

author
#0 lore raw

PATCH 1/1 hp-wmi: Fix warnings

Compilation of the HP WMI hotkeys code results in the following:

CC [M] drivers/misc/hp-wmi.o
drivers/misc/hp-wmi.c: In function hp_wmi_bios_setup:
drivers/misc/hp-wmi.c:431: warning: ignoring return value of rfkill_register,
declared with attribute warn_unused_result
drivers/misc/hp-wmi.c:441: warning: ignoring return value of rfkill_register,
declared with attribute warn_unused_result
drivers/misc/hp-wmi.c:450: warning: ignoring return value of rfkill_register,
declared with attribute warn_unused_result

Signed-off-by Larry Finger <[email protected]>

---

drivers/misc/hp-wmi.c +12 -3
Index: linux-2.6/drivers/misc/hp-wmi.c
===================================================================
@@ -428,7 +428,9 @@ static int __init hp_wmi_bios_setup(stru
 		wifi_rfkill->state = hp_wmi_wifi_state();
 		wifi_rfkill->toggle_radio = hp_wmi_wifi_set;
 		wifi_rfkill->user_claim_unsupported = 1;
-		rfkill_register(wifi_rfkill);
+		err = rfkill_register(wifi_rfkill);
+		if (err)
+			goto add_sysfs_error;
 	}
 
 	if (wireless & 0x2) {

@@ -438,7 +440,8 @@ static int __init hp_wmi_bios_setup(stru
 		bluetooth_rfkill->state = hp_wmi_bluetooth_state();
 		bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set;
 		bluetooth_rfkill->user_claim_unsupported = 1;
-		rfkill_register(bluetooth_rfkill);
+		err = rfkill_register(bluetooth_rfkill);
+			goto register_bluetooth_error;
 	}
 
 	if (wireless & 0x4) {

@@ -447,10 +450,16 @@ static int __init hp_wmi_bios_setup(stru
 		wwan_rfkill->state = hp_wmi_wwan_state();
 		wwan_rfkill->toggle_radio = hp_wmi_wwan_set;
 		wwan_rfkill->user_claim_unsupported = 1;
-		rfkill_register(wwan_rfkill);
+		err = rfkill_register(wwan_rfkill);
+		if (err)
+			goto register_wwan_err;
 	}
 
 	return 0;
+register_wwan_err:
+	rfkill_unregister(bluetooth_rfkill);
+register_bluetooth_error:
+	rfkill_unregister(wifi_rfkill);
 add_sysfs_error:
 	cleanup_sysfs(device);
 	return err;
#1 lore raw
Quoted 1 line · On Sun, 02 Nov 2008 08:36:06 -0800 Larry Finger <[email protected]>…

Subject: [PATCH] hp-wmi: Fix warnings

A nit: the point of such a patch is _not_ to "fix warnings". It is to fix the issues which those warnings are warning us about!

I renamed the patch to "hp-wmi: handle rfkill_register() failure", thanks.

Quoted 27 lines

Compilation of the HP WMI hotkeys code results in the following:

CC [M] drivers/misc/hp-wmi.o
drivers/misc/hp-wmi.c: In function hp_wmi_bios_setup:
drivers/misc/hp-wmi.c:431: warning: ignoring return value of rfkill_register,
declared with attribute warn_unused_result
drivers/misc/hp-wmi.c:441: warning: ignoring return value of rfkill_register,
declared with attribute warn_unused_result
drivers/misc/hp-wmi.c:450: warning: ignoring return value of rfkill_register,
declared with attribute warn_unused_result

Signed-off-by Larry Finger <[email protected]>

---

Index: linux-2.6/drivers/misc/hp-wmi.c
===================================================================

drivers/misc/hp-wmi.c +3 -1
@@ -428,7 +428,9 @@ static int __init hp_wmi_bios_setup(stru
 		wifi_rfkill->state = hp_wmi_wifi_state();
 		wifi_rfkill->toggle_radio = hp_wmi_wifi_set;
 		wifi_rfkill->user_claim_unsupported = 1;
-		rfkill_register(wifi_rfkill);
+		err = rfkill_register(wifi_rfkill);
+		if (err)
+			goto add_sysfs_error;