Commit 5b7fc772 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Kalle Valo
Browse files

wifi: wcn36xx: Rename clunky firmware feature bit enum 



The enum name "place_holder_in_cap_bitmap" is self descriptively asking to
be changed to something else.

Rename place_holder_in_cap_bitmap to wcn36xx_firmware_feat_caps so that the
contents and intent of the enum is obvious.

Reviewed-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220727161655.2286867-2-bryan.odonoghue@linaro.org
parent d578e0af

drivers/net/wireless/ath/wcn36xx/hal.h

+1 −1
Original line number Diff line number Diff line
@@ -4760,7 +4760,7 @@ struct wcn36xx_hal_set_power_params_resp { 


/* Capability bitmap exchange definitions and macros starts */



enum place_holder_in_cap_bitmap {

enum wcn36xx_firmware_feat_caps {

	MCC = 0,

	P2P = 1,

	DOT11AC = 2,

drivers/net/wireless/ath/wcn36xx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static const char * const wcn36xx_caps_names[] = { 


#undef DEFINE



static const char *wcn36xx_get_cap_name(enum place_holder_in_cap_bitmap x)

static const char *wcn36xx_get_cap_name(enum wcn36xx_firmware_feat_caps x)

{

	if (x >= ARRAY_SIZE(wcn36xx_caps_names))

		return "UNKNOWN";

drivers/net/wireless/ath/wcn36xx/smd.c

+3 −3
Original line number Diff line number Diff line
@@ -2431,7 +2431,7 @@ int wcn36xx_smd_dump_cmd_req(struct wcn36xx *wcn, u32 arg1, u32 arg2, 
	return ret;

}



void set_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap)

void set_feat_caps(u32 *bitmap, enum wcn36xx_firmware_feat_caps cap)

{

	int arr_idx, bit_idx;
@@ -2445,7 +2445,7 @@ void set_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap) 
	bitmap[arr_idx] |= (1 << bit_idx);

}



int get_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap)

int get_feat_caps(u32 *bitmap, enum wcn36xx_firmware_feat_caps cap)

{

	int arr_idx, bit_idx;
@@ -2460,7 +2460,7 @@ int get_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap) 
	return (bitmap[arr_idx] & (1 << bit_idx)) ? 1 : 0;

}



void clear_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap)

void clear_feat_caps(u32 *bitmap, enum wcn36xx_firmware_feat_caps cap)

{

	int arr_idx, bit_idx;

drivers/net/wireless/ath/wcn36xx/smd.h

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ int wcn36xx_smd_keep_alive_req(struct wcn36xx *wcn, 
int wcn36xx_smd_dump_cmd_req(struct wcn36xx *wcn, u32 arg1, u32 arg2,

			     u32 arg3, u32 arg4, u32 arg5);

int wcn36xx_smd_feature_caps_exchange(struct wcn36xx *wcn);

void set_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap);

int get_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap);

void clear_feat_caps(u32 *bitmap, enum place_holder_in_cap_bitmap cap);

void set_feat_caps(u32 *bitmap, enum wcn36xx_firmware_feat_caps cap);

int get_feat_caps(u32 *bitmap, enum wcn36xx_firmware_feat_caps cap);

void clear_feat_caps(u32 *bitmap, enum wcn36xx_firmware_feat_caps cap);



int wcn36xx_smd_add_ba_session(struct wcn36xx *wcn,

		struct ieee80211_sta *sta,