<yhchuang@xxxxxxxxxxx> wrote: > From: Yan-Hsuan Chuang <yhchuang@xxxxxxxxxxx> > > These helper functions seems useless. And in some cases > we want to use test_and_[set/clear]_bit, these helpers > will make the code more complicated. So remove them. > > Signed-off-by: Yan-Hsuan Chuang <yhchuang@xxxxxxxxxxx> Does not apply anymore, please rebase. Recorded preimage for 'drivers/net/wireless/realtek/rtw88/mac.c' error: Failed to merge in the changes. Applying: rtw88: remove redundant flag check helper function Using index info to reconstruct a base tree... M drivers/net/wireless/realtek/rtw88/mac.c M drivers/net/wireless/realtek/rtw88/main.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/realtek/rtw88/main.c Auto-merging drivers/net/wireless/realtek/rtw88/mac.c CONFLICT (content): Merge conflict in drivers/net/wireless/realtek/rtw88/mac.c Patch failed at 0001 rtw88: remove redundant flag check helper function The copy of the patch that failed is found in: .git/rebase-apply/patch 12 patches set to Changes Requested. 11146413 [01/15] rtw88: remove redundant flag check helper function 11146419 [03/15] rtw88: pci: reset H2C queue indexes in a single write 11146421 [06/15] rtw88: not to enter or leave PS under IRQ 11146441 [07/15] rtw88: not to control LPS by each vif 11146423 [08/15] rtw88: remove unused lps state check helper 11146437 [09/15] rtw88: LPS enter/leave should be protected by lock 11146425 [10/15] rtw88: leave PS state for dynamic mechanism 11146429 [11/15] rtw88: add deep power save support 11146435 [12/15] rtw88: not to enter LPS by coex strategy 11146427 [13/15] rtw88: select deep PS mode when module is inserted 11146433 [14/15] rtw88: add deep PS PG mode for 8822c 11146431 [15/15] rtw88: remove misleading module parameter rtw_fw_support_lps -- https://patchwork.kernel.org/patch/11146413/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches