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.
Signed-off-by: Bryan O'Donoghue <[email protected]>
---
drivers/net/wireless/ath/wcn36xx/hal.h | 2 +-
drivers/net/wireless/ath/wcn36xx/main.c | 2 +-
drivers/net/wireless/ath/wcn36xx/smd.c | 6 +++---
drivers/net/wireless/ath/wcn36xx/smd.h | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/hal.h b/drivers/net/wireless/ath/wcn36xx/hal.h
index 46a49f0a51b3..5e48c97682c2 100644
--- a/drivers/net/wireless/ath/wcn36xx/hal.h
+++ b/drivers/net/wireless/ath/wcn36xx/hal.h
@@ -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,
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index e34d3d0b7082..efd776b20e60 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -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";
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index 7ac9a1e6f768..88ee92be8562 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -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;
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h
index 3fd598ac2a27..186dad4fe80e 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.h
+++ b/drivers/net/wireless/ath/wcn36xx/smd.h
@@ -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,
--
2.36.1
On Tue, 19 Jul 2022 at 16:33, Bryan O'Donoghue
<[email protected]> wrote:
>
> 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.
>
> Signed-off-by: Bryan O'Donoghue <[email protected]>
Reviewed-by: Loic Poulain <[email protected]>
> ---
> drivers/net/wireless/ath/wcn36xx/hal.h | 2 +-
> drivers/net/wireless/ath/wcn36xx/main.c | 2 +-
> drivers/net/wireless/ath/wcn36xx/smd.c | 6 +++---
> drivers/net/wireless/ath/wcn36xx/smd.h | 6 +++---
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/wcn36xx/hal.h b/drivers/net/wireless/ath/wcn36xx/hal.h
> index 46a49f0a51b3..5e48c97682c2 100644
> --- a/drivers/net/wireless/ath/wcn36xx/hal.h
> +++ b/drivers/net/wireless/ath/wcn36xx/hal.h
> @@ -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,
> diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
> index e34d3d0b7082..efd776b20e60 100644
> --- a/drivers/net/wireless/ath/wcn36xx/main.c
> +++ b/drivers/net/wireless/ath/wcn36xx/main.c
> @@ -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";
> diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
> index 7ac9a1e6f768..88ee92be8562 100644
> --- a/drivers/net/wireless/ath/wcn36xx/smd.c
> +++ b/drivers/net/wireless/ath/wcn36xx/smd.c
> @@ -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;
>
> diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h
> index 3fd598ac2a27..186dad4fe80e 100644
> --- a/drivers/net/wireless/ath/wcn36xx/smd.h
> +++ b/drivers/net/wireless/ath/wcn36xx/smd.h
> @@ -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,
> --
> 2.36.1
>