staging: wfx: drop useless struct hif_suspend_resume_flags

Struct hif_suspend_resume_flags has no reason to exist. Drop it and
simplify access to struct hif_ind_suspend_resume_tx.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-16-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/hif_api_cmd.h b/drivers/staging/wfx/hif_api_cmd.h
index f86f6d4..4b01be6 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -446,16 +446,12 @@ struct hif_cnf_map_link {
        __le32 status;
 } __packed;
 
-struct hif_suspend_resume_flags {
+struct hif_ind_suspend_resume_tx {
        u8     resume:1;
        u8     reserved1:2;
        u8     bc_mc_only:1;
        u8     reserved2:4;
        u8     reserved3;
-} __packed;
-
-struct hif_ind_suspend_resume_tx {
-       struct hif_suspend_resume_flags suspend_resume_flags;
        __le16 peer_sta_set;
 } __packed;
 

diff --git a/drivers/staging/wfx/hif_rx.c b/drivers/staging/wfx/hif_rx.c
index cf7a956..798167a 100644 (file)
--- a/drivers/staging/wfx/hif_rx.c
+++ b/drivers/staging/wfx/hif_rx.c
@@ -203,16 +203,16 @@ static int hif_suspend_resume_indication(struct wfx_dev *wdev,
        struct wfx_vif *wvif = wdev_to_wvif(wdev, hif->interface);
        const struct hif_ind_suspend_resume_tx *body = buf;
 
-       if (body->suspend_resume_flags.bc_mc_only) {
+       if (body->bc_mc_only) {
                WARN_ON(!wvif);
-               if (body->suspend_resume_flags.resume)
+               if (body->resume)
                        wfx_suspend_resume_mc(wvif, STA_NOTIFY_AWAKE);
                else
                        wfx_suspend_resume_mc(wvif, STA_NOTIFY_SLEEP);
        } else {
                WARN(body->peer_sta_set, "misunderstood indication");
                WARN(hif->interface != 2, "misunderstood indication");
-               if (body->suspend_resume_flags.resume)
+               if (body->resume)
                        wfx_suspend_hot_dev(wdev, STA_NOTIFY_AWAKE);
                else
                        wfx_suspend_hot_dev(wdev, STA_NOTIFY_SLEEP);