staging: r8188eu: make on_action_public static void

The on_action_public function is called only by OnAction. This function
also lives in rtw_mlme_ext.c and does not check the return value from
on_action_public.

We can make on_action_public a static void function.

The ret variable is no longer needed if we don't return a value. It can
be removed.

Reported-by: kernel test robot <lkp@intel.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20221030173326.1588647-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 7d4f208d161bb9f8b5524ae37573c1b58edb1c60..88600f62ffb4bd73bb4cbce87f6bbc1c5208690a 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -3813,30 +3813,26 @@ exit:
        return ret;
 }
 
-unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv_frame)
+static void on_action_public(struct adapter *padapter, struct recv_frame *precv_frame)
 {
        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data;
-       unsigned int ret = _FAIL;
        u8 *pframe = precv_frame->rx_data;
        u8 *frame_body = pframe + sizeof(struct ieee80211_hdr_3addr);
        u8 action;
 
        /* check RA matches or not */
        if (memcmp(myid(&padapter->eeprompriv), mgmt->da, ETH_ALEN))
-               goto exit;
+               return;
 
        action = frame_body[1];
        switch (action) {
        case ACT_PUBLIC_VENDOR:
-               ret = on_action_public_vendor(precv_frame);
+               on_action_public_vendor(precv_frame);
                break;
        default:
-               ret = on_action_public_default(precv_frame);
+               on_action_public_default(precv_frame);
                break;
        }
-
-exit:
-       return ret;
 }
 
 unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_frame)

diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index c8beaa927cba1aa30494c2c3376af9d4b601565b..ec2e9352011beee8ce8f0aeb5f2a026cb19af3b4 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -538,8 +538,6 @@ void start_create_ibss(struct adapter *padapter);
 
 unsigned int OnAction_back(struct adapter *padapter,
                           struct recv_frame *precv_frame);
-unsigned int on_action_public(struct adapter *padapter,
-                             struct recv_frame *precv_frame);
 unsigned int OnAction_p2p(struct adapter *padapter,
                          struct recv_frame *precv_frame);