diff mbox series

[v2] wifi: rfkill: Correct parameter type for rfkill_set_hw_state_reason()

Message ID 20240811-rfkill_fix-v2-1-9050760336f4@quicinc.com (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show
Series [v2] wifi: rfkill: Correct parameter type for rfkill_set_hw_state_reason() | expand

Commit Message

Zijun Hu Aug. 11, 2024, 4:47 a.m. UTC 
From: Zijun Hu <quic_zijuhu@quicinc.com>

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>
---
Changes in v2:
- Fix indentation issue and correct commit message
- Git rebase over the following commit:
  Commit: cc32e9fb380d ("Merge tag 'rtw-next-2024-08-09' of https://github.com/pkshih/rtw")
- Link to v1: https://lore.kernel.org/r/20240715-rfkill_fix-v1-1-a9f2d56b4716@quicinc.com
---
 include/linux/rfkill.h | 5 +++--
 net/rfkill/core.c      | 8 ++------
 2 files changed, 5 insertions(+), 8 deletions(-)


---
base-commit: cc32e9fb380d8afdbf3486d7063d5520bfb0f071
change-id: 20240715-rfkill_fix-335afa2e88ca

Best regards,
diff mbox series

Patch

diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 373003ace639..997b34197385 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -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.
  */
 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: 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,
 					      bool blocked,
-					      unsigned long reason)
+					      enum rfkill_hard_block_reasons reason)
 {
 	return blocked;
 }
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 7a5367628c05..13a5126bc36e 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -539,18 +539,14 @@  bool rfkill_get_global_sw_state(const enum rfkill_type type)
 #endif
 
 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;
 	bool ret, prev;
 
 	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);
 	prev = !!(rfkill->hard_block_reasons & reason);
 	if (blocked) {