staging: wfx: drop useless struct hif_map_link_flags

Struct hif_map_link_flags has no reason to exist. Drop it and simplify
access to struct hif_req_map_link.

Also rename the field 'map_direction' in 'unmap'. It is more
meaningful and allows to drop enum hif_sta_map_direction.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-15-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 895f26d9f1a2cba814febfe2f7b39501acb1e48d..f86f6d491fb24c181d5696502bd1ee6750274178 100644 (file)
--- a/drivers/staging/wfx/hif_api_cmd.h
+++ b/drivers/staging/wfx/hif_api_cmd.h
@@ -434,20 +434,11 @@ struct hif_cnf_beacon_transmit {
 #define HIF_LINK_ID_MAX            14
 #define HIF_LINK_ID_NOT_ASSOCIATED (HIF_LINK_ID_MAX + 1)
 
-enum hif_sta_map_direction {
-       HIF_STA_MAP                       = 0x0,
-       HIF_STA_UNMAP                     = 0x1
-};
-
-struct hif_map_link_flags {
-       u8     map_direction:1;
-       u8     mfpc:1;
-       u8     reserved:6;
-} __packed;
-
 struct hif_req_map_link {
        u8     mac_addr[ETH_ALEN];
-       struct hif_map_link_flags map_link_flags;
+       u8     unmap:1;
+       u8     mfpc:1;
+       u8     reserved:6;
        u8     peer_sta_id;
 } __packed;
 

diff --git a/drivers/staging/wfx/hif_tx.c b/drivers/staging/wfx/hif_tx.c
index 49523e70af6cfd44b66d6ab755ed70d813b38c6b..eddb60dec0697420c7c502ff6ea53e88464415c4 100644 (file)
--- a/drivers/staging/wfx/hif_tx.c
+++ b/drivers/staging/wfx/hif_tx.c
@@ -502,8 +502,8 @@ int hif_map_link(struct wfx_vif *wvif, bool unmap, u8 *mac_addr, int sta_id, boo
                return -ENOMEM;
        if (mac_addr)
                ether_addr_copy(body->mac_addr, mac_addr);
-       body->map_link_flags.mfpc = mfp ? 1 : 0;
-       body->map_link_flags.map_direction = unmap ? 1 : 0;
+       body->mfpc = mfp ? 1 : 0;
+       body->unmap = unmap ? 1 : 0;
        body->peer_sta_id = sta_id;
        wfx_fill_header(hif, wvif->id, HIF_REQ_ID_MAP_LINK, sizeof(*body));
        ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false);