* [PATCH] ath11k: Remove unnecessary enum scan_priority
@ 2019-12-11 19:22 Nathan Chancellor
2019-12-12 19:34 ` Nick Desaulniers
2019-12-18 17:51 ` Kalle Valo
0 siblings, 2 replies; 6+ messages in thread
From: Nathan Chancellor @ 2019-12-11 19:22 UTC (permalink / raw)
To: Kalle Valo
Cc: ath11k, linux-wireless, netdev, linux-kernel, clang-built-linux,
Nathan Chancellor
Clang warns:
drivers/net/wireless/ath/ath11k/wmi.c:1827:23: warning: implicit
conversion from enumeration type 'enum wmi_scan_priority' to different
enumeration type 'enum scan_priority' [-Wenum-conversion]
arg->scan_priority = WMI_SCAN_PRIORITY_LOW;
~ ^~~~~~~~~~~~~~~~~~~~~
1 warning generated.
wmi_scan_priority and scan_priority have the same values but the wmi one
has WMI prefixed to the names. Since that enum is already being used,
get rid of scan_priority and switch its one use to wmi_scan_priority to
fix this warning.
Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Link: https://github.com/ClangBuiltLinux/linux/issues/808
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
drivers/net/wireless/ath/ath11k/wmi.h | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 4a518d406bc5..756101656391 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -2896,15 +2896,6 @@ struct wmi_bcn_offload_ctrl_cmd {
u32 bcn_ctrl_op;
} __packed;
-enum scan_priority {
- SCAN_PRIORITY_VERY_LOW,
- SCAN_PRIORITY_LOW,
- SCAN_PRIORITY_MEDIUM,
- SCAN_PRIORITY_HIGH,
- SCAN_PRIORITY_VERY_HIGH,
- SCAN_PRIORITY_COUNT,
-};
-
enum scan_dwelltime_adaptive_mode {
SCAN_DWELL_MODE_DEFAULT = 0,
SCAN_DWELL_MODE_CONSERVATIVE = 1,
@@ -3056,7 +3047,7 @@ struct scan_req_params {
u32 scan_req_id;
u32 vdev_id;
u32 pdev_id;
- enum scan_priority scan_priority;
+ enum wmi_scan_priority scan_priority;
union {
struct {
u32 scan_ev_started:1,
--
2.24.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ath11k: Remove unnecessary enum scan_priority
2019-12-11 19:22 [PATCH] ath11k: Remove unnecessary enum scan_priority Nathan Chancellor
@ 2019-12-12 19:34 ` Nick Desaulniers
2019-12-19 13:31 ` Kalle Valo
2019-12-18 17:51 ` Kalle Valo
1 sibling, 1 reply; 6+ messages in thread
From: Nick Desaulniers @ 2019-12-12 19:34 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Kalle Valo, ath11k, linux-wireless, Network Development, LKML,
clang-built-linux
On Wed, Dec 11, 2019 at 11:23 AM Nathan Chancellor
<natechancellor@gmail.com> wrote:
>
> Clang warns:
>
> drivers/net/wireless/ath/ath11k/wmi.c:1827:23: warning: implicit
> conversion from enumeration type 'enum wmi_scan_priority' to different
> enumeration type 'enum scan_priority' [-Wenum-conversion]
> arg->scan_priority = WMI_SCAN_PRIORITY_LOW;
> ~ ^~~~~~~~~~~~~~~~~~~~~
> 1 warning generated.
>
> wmi_scan_priority and scan_priority have the same values but the wmi one
> has WMI prefixed to the names. Since that enum is already being used,
> get rid of scan_priority and switch its one use to wmi_scan_priority to
> fix this warning.
>
> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Link: https://github.com/ClangBuiltLinux/linux/issues/808
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Further, it looks like the member `scan_priority` in `struct
wmi_start_scan_arg` and `struct wmi_start_scan_cmd` should probably
use `enum wmi_scan_priority`, rather than `u32`. Also, I don't know
if the more concisely named enum is preferable? Either way, thanks
for the patch.
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
> drivers/net/wireless/ath/ath11k/wmi.h | 11 +----------
> 1 file changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
> index 4a518d406bc5..756101656391 100644
> --- a/drivers/net/wireless/ath/ath11k/wmi.h
> +++ b/drivers/net/wireless/ath/ath11k/wmi.h
> @@ -2896,15 +2896,6 @@ struct wmi_bcn_offload_ctrl_cmd {
> u32 bcn_ctrl_op;
> } __packed;
>
> -enum scan_priority {
> - SCAN_PRIORITY_VERY_LOW,
> - SCAN_PRIORITY_LOW,
> - SCAN_PRIORITY_MEDIUM,
> - SCAN_PRIORITY_HIGH,
> - SCAN_PRIORITY_VERY_HIGH,
> - SCAN_PRIORITY_COUNT,
> -};
> -
> enum scan_dwelltime_adaptive_mode {
> SCAN_DWELL_MODE_DEFAULT = 0,
> SCAN_DWELL_MODE_CONSERVATIVE = 1,
> @@ -3056,7 +3047,7 @@ struct scan_req_params {
> u32 scan_req_id;
> u32 vdev_id;
> u32 pdev_id;
> - enum scan_priority scan_priority;
> + enum wmi_scan_priority scan_priority;
> union {
> struct {
> u32 scan_ev_started:1,
> --
> 2.24.0
>
> --
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ath11k: Remove unnecessary enum scan_priority
2019-12-12 19:34 ` Nick Desaulniers
@ 2019-12-19 13:31 ` Kalle Valo
2019-12-19 17:06 ` Nick Desaulniers
0 siblings, 1 reply; 6+ messages in thread
From: Kalle Valo @ 2019-12-19 13:31 UTC (permalink / raw)
To: Nick Desaulniers
Cc: Nathan Chancellor, Network Development, linux-wireless, LKML,
clang-built-linux, ath11k
Nick Desaulniers <ndesaulniers@google.com> writes:
> On Wed, Dec 11, 2019 at 11:23 AM Nathan Chancellor
> <natechancellor@gmail.com> wrote:
>>
>> Clang warns:
>>
>> drivers/net/wireless/ath/ath11k/wmi.c:1827:23: warning: implicit
>> conversion from enumeration type 'enum wmi_scan_priority' to different
>> enumeration type 'enum scan_priority' [-Wenum-conversion]
>> arg->scan_priority = WMI_SCAN_PRIORITY_LOW;
>> ~ ^~~~~~~~~~~~~~~~~~~~~
>> 1 warning generated.
>>
>> wmi_scan_priority and scan_priority have the same values but the wmi one
>> has WMI prefixed to the names. Since that enum is already being used,
>> get rid of scan_priority and switch its one use to wmi_scan_priority to
>> fix this warning.
>>
>> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
>> Link: https://github.com/ClangBuiltLinux/linux/issues/808
>> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
>
> Further, it looks like the member `scan_priority` in `struct
> wmi_start_scan_arg` and `struct wmi_start_scan_cmd` should probably
> use `enum wmi_scan_priority`, rather than `u32`.
struct wmi_start_scan_cmd is sent to firmware and that's why it has u32
to make sure that the size is exactly 32 bits.
> Also, I don't know if the more concisely named enum is preferable?
I didn't get this comment.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ath11k: Remove unnecessary enum scan_priority
2019-12-19 13:31 ` Kalle Valo
@ 2019-12-19 17:06 ` Nick Desaulniers
2019-12-20 7:19 ` Kalle Valo
0 siblings, 1 reply; 6+ messages in thread
From: Nick Desaulniers @ 2019-12-19 17:06 UTC (permalink / raw)
To: Kalle Valo
Cc: Nathan Chancellor, Network Development, linux-wireless, LKML,
clang-built-linux, ath11k
On Thu, Dec 19, 2019 at 5:32 AM Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Nick Desaulniers <ndesaulniers@google.com> writes:
>
> > On Wed, Dec 11, 2019 at 11:23 AM Nathan Chancellor
> > <natechancellor@gmail.com> wrote:
> >> wmi_scan_priority and scan_priority have the same values but the wmi one
> >> has WMI prefixed to the names. Since that enum is already being used,
> >> get rid of scan_priority and switch its one use to wmi_scan_priority to
> >> fix this warning.
> >>
> > Also, I don't know if the more concisely named enum is preferable?
>
> I didn't get this comment.
Given two enums with the same values:
enum scan_priority
enum wmi_scan_priority
wouldn't you prefer to type wmi_ a few times less? Doesn't really
matter, but that was the point I was making.
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ath11k: Remove unnecessary enum scan_priority
2019-12-19 17:06 ` Nick Desaulniers
@ 2019-12-20 7:19 ` Kalle Valo
0 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2019-12-20 7:19 UTC (permalink / raw)
To: Nick Desaulniers
Cc: Network Development, linux-wireless, LKML, clang-built-linux,
Nathan Chancellor, ath11k
Nick Desaulniers <ndesaulniers@google.com> writes:
> On Thu, Dec 19, 2019 at 5:32 AM Kalle Valo <kvalo@codeaurora.org> wrote:
>>
>> Nick Desaulniers <ndesaulniers@google.com> writes:
>>
>> > On Wed, Dec 11, 2019 at 11:23 AM Nathan Chancellor
>> > <natechancellor@gmail.com> wrote:
>> >> wmi_scan_priority and scan_priority have the same values but the wmi one
>> >> has WMI prefixed to the names. Since that enum is already being used,
>> >> get rid of scan_priority and switch its one use to wmi_scan_priority to
>> >> fix this warning.
>> >>
>> > Also, I don't know if the more concisely named enum is preferable?
>>
>> I didn't get this comment.
>
> Given two enums with the same values:
> enum scan_priority
> enum wmi_scan_priority
> wouldn't you prefer to type wmi_ a few times less? Doesn't really
> matter, but that was the point I was making.
Ah, now I got it :) This enum is part of firmware interface (WMI) so
yes, I prefer to use the wmi_ prefix to make that obvious.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ath11k: Remove unnecessary enum scan_priority
2019-12-11 19:22 [PATCH] ath11k: Remove unnecessary enum scan_priority Nathan Chancellor
2019-12-12 19:34 ` Nick Desaulniers
@ 2019-12-18 17:51 ` Kalle Valo
1 sibling, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2019-12-18 17:51 UTC (permalink / raw)
To: Nathan Chancellor
Cc: ath11k, linux-wireless, netdev, linux-kernel, clang-built-linux,
Nathan Chancellor
Nathan Chancellor <natechancellor@gmail.com> wrote:
> Clang warns:
>
> drivers/net/wireless/ath/ath11k/wmi.c:1827:23: warning: implicit
> conversion from enumeration type 'enum wmi_scan_priority' to different
> enumeration type 'enum scan_priority' [-Wenum-conversion]
> arg->scan_priority = WMI_SCAN_PRIORITY_LOW;
> ~ ^~~~~~~~~~~~~~~~~~~~~
> 1 warning generated.
>
> wmi_scan_priority and scan_priority have the same values but the wmi one
> has WMI prefixed to the names. Since that enum is already being used,
> get rid of scan_priority and switch its one use to wmi_scan_priority to
> fix this warning.
>
> Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Link: https://github.com/ClangBuiltLinux/linux/issues/808
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Patch applied to ath-next branch of ath.git, thanks.
509421acab69 ath11k: Remove unnecessary enum scan_priority
--
https://patchwork.kernel.org/patch/11286141/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-20 7:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-11 19:22 [PATCH] ath11k: Remove unnecessary enum scan_priority Nathan Chancellor
2019-12-12 19:34 ` Nick Desaulniers
2019-12-19 13:31 ` Kalle Valo
2019-12-19 17:06 ` Nick Desaulniers
2019-12-20 7:19 ` Kalle Valo
2019-12-18 17:51 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).