staging: wfx: drop useless struct hif_pm_mode

Struct hif_pm_mode has no reason to exist. Drop it and simplify access
to struct hif_req_set_pm_mode.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-17-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 4b01be677e08c21923afe06428e94cfde0002b39..6ecb23ceaf8cdfb9049c97cc21d61ac04ed863b8 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -378,14 +378,10 @@ struct hif_cnf_set_bss_params {
        __le32 status;
 } __packed;
 
-struct hif_pm_mode {
+struct hif_req_set_pm_mode {
        u8     enter_psm:1;
        u8     reserved:6;
        u8     fast_psm:1;
-} __packed;
-
-struct hif_req_set_pm_mode {
-       struct hif_pm_mode pm_mode;
        u8     fast_psm_idle_period;
        u8     ap_psm_change_period;
        u8     min_auto_ps_poll_period;

diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c
index eddb60dec0697420c7c502ff6ea53e88464415c4..134af4daee9624c0ebe6f498f5530c42e0838e80 100644 (file)
--- a/drivers/staging/wfx/hif_tx.c
+++ b/drivers/staging/wfx/hif_tx.c
@@ -439,11 +439,11 @@ int hif_set_pm(struct wfx_vif *wvif, bool ps, int dynamic_ps_timeout)
        if (!hif)
                return -ENOMEM;
        if (ps) {
-               body->pm_mode.enter_psm = 1;
+               body->enter_psm = 1;
                // Firmware does not support more than 128ms
                body->fast_psm_idle_period = min(dynamic_ps_timeout * 2, 255);
                if (body->fast_psm_idle_period)
-                       body->pm_mode.fast_psm = 1;
+                       body->fast_psm = 1;
        }
        wfx_fill_header(hif, wvif->id, HIF_REQ_ID_SET_PM_MODE, sizeof(*body));
        ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false);