UPSTREAM: mwifiex: remove get operation code for SUBSCRIBE EVENT command

We don't send this command with GET action. Redundant code in
mwifiex_ret_subsc_evt() is removed in this patch.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
BUG=chrome-os-partner:13998
TEST=Build and run autotest suites

Change-Id: I426e20adf7c509b253386694e4ae90c4b052a682
Reviewed-on: https://gerrit.chromium.org/gerrit/33145
Reviewed-by: Gary Morain <gmorain@chromium.org>
Tested-by: Bing Zhao <bzhao@marvell.com>
Commit-Ready: Bing Zhao <bzhao@marvell.com>

diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index 7eb6d9e..946dcf5 100644 (file)
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -792,21 +792,14 @@ static int mwifiex_ret_ibss_coalescing_status(struct mwifiex_private *priv,
  * This function handles the command response for subscribe event command.
  */
 static int mwifiex_ret_subsc_evt(struct mwifiex_private *priv,
-                                struct host_cmd_ds_command *resp,
-                                struct mwifiex_ds_misc_subsc_evt *sub_event)
+                                struct host_cmd_ds_command *resp)
 {
        struct host_cmd_ds_802_11_subsc_evt *cmd_sub_event =
                (struct host_cmd_ds_802_11_subsc_evt *)&resp->params.subsc_evt;
 
-       /* For every subscribe event command (Get/Set/Clear), FW reports the
-        * current set of subscribed events*/
        dev_dbg(priv->adapter->dev, "Bitmap of currently subscribed events: %16x\n",
                le16_to_cpu(cmd_sub_event->events));
 
-       /*Return the subscribed event info for a Get request*/
-       if (sub_event)
-               sub_event->events = le16_to_cpu(cmd_sub_event->events);
-
        return 0;
 }
 
@@ -951,7 +944,7 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
        case HostCmd_CMD_PCIE_DESC_DETAILS:
                break;
        case HostCmd_CMD_802_11_SUBSCRIBE_EVENT:
-               ret = mwifiex_ret_subsc_evt(priv, resp, data_buf);
+               ret = mwifiex_ret_subsc_evt(priv, resp);
                break;
        default:
                dev_err(adapter->dev, "CMD_RESP: unknown cmd response %#x\n",