staging: wfx: drop useless struct hif_reset_flags

Struct hif_reset_flags has no reason to exist. Drop it and simplify
access to struct hif_req_reset.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-11-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 c132d8e43b505b1f7df6d5e298c222b999693e17..3da736dbf52c219efd3fa563c79b7a22a1754951 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -60,15 +60,15 @@ enum hif_indications_ids {
        HIF_IND_ID_EVENT                = 0x85
 };
 
-struct hif_reset_flags {
+struct hif_req_reset {
        u8     reset_stat:1;
        u8     reset_all_int:1;
        u8     reserved1:6;
        u8     reserved2[3];
 } __packed;
 
-struct hif_req_reset {
-       struct hif_reset_flags reset_flags;
+struct hif_cnf_reset {
+       __le32 status;
 } __packed;
 
 struct hif_req_read_mib {

diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c
index f91b19ddf8e386fc7810abe18608563882973c20..8736eb4d5f15d2993a994ef295cd421580d14c54 100644 (file)
--- a/drivers/staging/wfx/hif_tx.c
+++ b/drivers/staging/wfx/hif_tx.c
@@ -170,7 +170,7 @@ int hif_reset(struct wfx_vif *wvif, bool reset_stat)
 
        if (!hif)
                return -ENOMEM;
-       body->reset_flags.reset_stat = reset_stat;
+       body->reset_stat = reset_stat;
        wfx_fill_header(hif, wvif->id, HIF_REQ_ID_RESET, sizeof(*body));
        ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false);
        kfree(hif);