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

rfkill: remove/inline __rfkill_set_hw_state

Browse Source 
__rfkill_set_hw_state() is only one used in rfkill_set_hw_state(), and
none of them are long or complicated, so merging the two makes the code
easier to read.

Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
João Paulo Rechi Vita 2016-01-19 10:42:38 -05:00 committed by Johannes Berg
parent f3e7fae248
commit 1926e260d8
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net/rfkill/core.c
View File

@ -235,29 +235,6 @@ static void rfkill_event(struct rfkill *rfkill)
rfkill_send_events(rfkill, RFKILL_OP_CHANGE); rfkill_send_events(rfkill, RFKILL_OP_CHANGE);
} }
static bool __rfkill_set_hw_state(struct rfkill *rfkill,
bool blocked, bool *change)
{
unsigned long flags;
bool prev, any;
BUG_ON(!rfkill);
spin_lock_irqsave(&rfkill->lock, flags);
prev = !!(rfkill->state & RFKILL_BLOCK_HW);
if (blocked)
rfkill->state |= RFKILL_BLOCK_HW;
else
rfkill->state &= ~RFKILL_BLOCK_HW;
*change = prev != blocked;
any = !!(rfkill->state & RFKILL_BLOCK_ANY);
spin_unlock_irqrestore(&rfkill->lock, flags);
rfkill_led_trigger_event(rfkill);
return any;
}
/** /**
* rfkill_set_block - wrapper for set_block method * rfkill_set_block - wrapper for set_block method
* *
@ -482,14 +459,26 @@ bool rfkill_get_global_sw_state(const enum rfkill_type type)
bool rfkill_set_hw_state(struct rfkill *rfkill, bool blocked) bool rfkill_set_hw_state(struct rfkill *rfkill, bool blocked)
{ {
bool ret, change; unsigned long flags;
bool ret, prev;
ret = __rfkill_set_hw_state(rfkill, blocked, &change); BUG_ON(!rfkill);
spin_lock_irqsave(&rfkill->lock, flags);
prev = !!(rfkill->state & RFKILL_BLOCK_HW);
if (blocked)
rfkill->state |= RFKILL_BLOCK_HW;
else
rfkill->state &= ~RFKILL_BLOCK_HW;
ret = !!(rfkill->state & RFKILL_BLOCK_ANY);
spin_unlock_irqrestore(&rfkill->lock, flags);
rfkill_led_trigger_event(rfkill);
if (!rfkill->registered) if (!rfkill->registered)
return ret; return ret;
if (change) if (prev != blocked)
schedule_work(&rfkill->uevent_work); schedule_work(&rfkill->uevent_work);
return ret; return ret;