Skip to contentSkip to conversation

Rfkill rewrite

PATCH In review Alan Jenkins 2 participants 4 messages Jul 18, 2009 Rfkill

lore
Share & tools
lore
#0 lore raw
Quoted 12 lines · Johannes Berg
Quoted 9 lines · Alan Jenkins

API nit:

* This function tells the rfkill core that the device is capable of
* remembering soft blocks (which it is notified of via the set_block
* method) -- this means that the driver may ignore the return value
* from rfkill_set_hw_state().

Doesn't this conflict with the declaration of rfkill_set_hw_state() as __must_check?

Quoted 6 lines

Yeah, in a way it does, but I figure it's rare enough that those who really can ignore it can write

	(void) rfkill_set_hw_state(...)

Don't really have a strong opinion, it just seemed the mistake in the other direction would be more common.

It seems my GCC has a stronger definition of "must" than you do :-). I can't get rid of the warning by casting it to void. So I'm not sure __must_check is really appropriate here.

drivers/platform/x86/hp-wmi.c: In function ‘hp_wmi_bios_setup’:
drivers/platform/x86/hp-wmi.c:467: warning: ignoring return value of ‘rfkill_set_hw_state’, declared with attribute warn_unused_result

$ grep -n rfkill_set_hw_state drivers/platform/x86/hp-wmi.c
467:            (void) rfkill_set_hw_state(wifi_rfkill,
$ gcc -v
Using built-in specs.
Target: x86_64-linux-gnu
Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
Thread model: posix
gcc version 4.2.4 (Ubuntu 4.2.4-1ubuntu3)

Thanks
Alan

maintainer
#1 lore raw
Quoted 3 lines · Alan Jenkins

It seems my GCC has a stronger definition of "must" than you do :-). I can't get rid of the warning by casting it to void. So I'm not sure __must_check is really appropriate here.

Heh, my gcc agrees with you :)
I'm happy to remove it -- want to send a patch?

johannes

#2 lore raw

PATCH 1/1 rfkill: remove too-strict __must_check

Some drivers don't need the return value of rfkill_set_hw_state(), so it should not be marked as __must_check.

---
 include/linux/rfkill.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/rfkill.h +1 -1
index f3d5812..1020290 100644
@@ -238,7 +238,7 @@ void rfkill_destroy(struct rfkill *rfkill);
  * should be blocked) so that drivers need not keep track of the soft
  * block state -- which they might not be able to.
  */
-bool __must_check rfkill_set_hw_state(struct rfkill *rfkill, bool blocked);
+bool rfkill_set_hw_state(struct rfkill *rfkill, bool blocked);
 
 /**
  * rfkill_set_sw_state - Set the internal rfkill software block state
Signature · 1 line
1.6.3.2
maintainer Acked-by on v1 1/1
#3 lore raw

Re: [PATCH] rfkill: remove too-strict __must_check

Quoted 4 lines · Alan Jenkins

Some drivers don't need the return value of rfkill_set_hw_state(), so it should not be marked as __must_check.

Thanks.

Quoted 17 lines
---
 include/linux/rfkill.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/rfkill.h +1 -1
index f3d5812..1020290 100644
@@ -238,7 +238,7 @@ void rfkill_destroy(struct rfkill *rfkill);
  * should be blocked) so that drivers need not keep track of the soft
  * block state -- which they might not be able to.
  */
-bool __must_check rfkill_set_hw_state(struct rfkill *rfkill, bool blocked);
+bool rfkill_set_hw_state(struct rfkill *rfkill, bool blocked);
 
 /**
  * rfkill_set_sw_state - Set the internal rfkill software block state