Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 06:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: rfkill: Correct parameter type for rfkill_set_hw_state_reason()

Browse Source 
Change type of parameter @reason to enum rfkill_hard_block_reasons
for API rfkill_set_hw_state_reason() according to its comments, and
all kernel callers have invoked the API with enum type actually.

Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://patch.msgid.link/20240811-rfkill_fix-v2-1-9050760336f4@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Zijun Hu 2024-08-11 12:47:26 +08:00 committed by Johannes Berg
parent a0ee9dcce6
commit 373d3f8dcb
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/rfkill.h
View File

@ -147,7 +147,8 @@ void rfkill_destroy(struct rfkill *rfkill);
* Prefer to use rfkill_set_hw_state if you don't need any special reason. * Prefer to use rfkill_set_hw_state if you don't need any special reason.
*/ */
bool rfkill_set_hw_state_reason(struct rfkill *rfkill, bool rfkill_set_hw_state_reason(struct rfkill *rfkill,
bool blocked, unsigned long reason); bool blocked,
enum rfkill_hard_block_reasons reason);
/** /**
* rfkill_set_hw_state - Set the internal rfkill hardware block state * rfkill_set_hw_state - Set the internal rfkill hardware block state
* @rfkill: pointer to the rfkill class to modify. * @rfkill: pointer to the rfkill class to modify.
@ -280,7 +281,7 @@ static inline void rfkill_destroy(struct rfkill *rfkill)
static inline bool rfkill_set_hw_state_reason(struct rfkill *rfkill, static inline bool rfkill_set_hw_state_reason(struct rfkill *rfkill,
bool blocked, bool blocked,
unsigned long reason) enum rfkill_hard_block_reasons reason)
{ {
return blocked; return blocked;
} }

8
net/rfkill/core.c
View File

@ -539,18 +539,14 @@ bool rfkill_get_global_sw_state(const enum rfkill_type type)
#endif #endif
bool rfkill_set_hw_state_reason(struct rfkill *rfkill, bool rfkill_set_hw_state_reason(struct rfkill *rfkill,
bool blocked, unsigned long reason) bool blocked,
enum rfkill_hard_block_reasons reason)
{ {
unsigned long flags; unsigned long flags;
bool ret, prev; bool ret, prev;
BUG_ON(!rfkill); BUG_ON(!rfkill);
if (WARN(reason & ~(RFKILL_HARD_BLOCK_SIGNAL |
RFKILL_HARD_BLOCK_NOT_OWNER),
"hw_state reason not supported: 0x%lx", reason))
return rfkill_blocked(rfkill);
spin_lock_irqsave(&rfkill->lock, flags); spin_lock_irqsave(&rfkill->lock, flags);
prev = !!(rfkill->hard_block_reasons & reason); prev = !!(rfkill->hard_block_reasons & reason);
if (blocked) { if (blocked) {