OSDN Git Service

ath11k: Remove unnecessary enum scan_priority
authorNathan Chancellor <natechancellor@gmail.com>
Wed, 11 Dec 2019 19:22:52 +0000 (12:22 -0700)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 18 Dec 2019 17:51:14 +0000 (19:51 +0200)
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>
drivers/net/wireless/ath/ath11k/wmi.h

index eed6a1a..5b64eb2 100644 (file)
@@ -2904,15 +2904,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,
@@ -3064,7 +3055,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,