| Message ID | ad72403d4d99a1b13ea7f99b0ea992b23aa2ea09.1479458373.git.kirtika@google.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
Kirtika Ruchandani <kirtika.ruchandani@gmail.com> wrote: > Commit bec568ff5107 removed the last remaining usage of struct > mwifiex_private* priv in mwifiex_fw_dpc(), by removing the call to > mwifiex_del_virtual_intf(). > Compiling mwifiex/ with W=1 gives the following warning, fix it. > mwifiex/main.c: In function ‘mwifiex_fw_dpc’: > mwifiex/main.c:520:26: warning: variable ‘priv’ set but not used [-Wunused-but-set-variable] > > Fixes: bec568ff5107 ("mwifiex: failure path handling in mwifiex_add_virtual_intf()") > Cc: Amitkumar Karwar <akarwar@marvell.com> > Signed-off-by: Kirtika Ruchandani <kirtika@google.com> Failed to apply to wireless-drivers-next: Applying: mwifiex: Remove unused 'pm_flag' variable Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/marvell/mwifiex/sdio.c CONFLICT (content): Merge conflict in drivers/net/wireless/marvell/mwifiex/sdio.c Failed to merge in the changes. Patch failed at 0001 mwifiex: Remove unused 'pm_flag' variable 7 patches set to Changes Requested. 9435943 [1/7] mwifiex: Removed unused mwifiex_private* 'priv' variable 9435945 [2/7] mwifiex: Remove unused 'chan_num' variable 9435947 [3/7] mwifiex: Remove unused 'sta_ptr' variable 9435949 [4/7] mwifiex: Remove unused 'adapter'variable 9435951 [5/7] mwifiex: Remove unused 'pm_flag' variable 9435953 [6/7] mwifiex: Removed unused 'pkt_type' variable 9435955 [7/7] mwifiex: Remove unused 'bcd_usb' variable
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index 2478ccd..fff96be 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -517,7 +517,6 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context) { int ret; char fmt[64]; - struct mwifiex_private *priv; struct mwifiex_adapter *adapter = context; struct mwifiex_fw_image fw; struct semaphore *sem = adapter->card_sem; @@ -575,8 +574,6 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context) goto err_init_fw; } - priv = adapter->priv[MWIFIEX_BSS_ROLE_STA]; - if (!adapter->wiphy) { if (mwifiex_register_cfg80211(adapter)) { mwifiex_dbg(adapter, ERROR,
Commit bec568ff5107 removed the last remaining usage of struct mwifiex_private* priv in mwifiex_fw_dpc(), by removing the call to mwifiex_del_virtual_intf(). Compiling mwifiex/ with W=1 gives the following warning, fix it. mwifiex/main.c: In function ‘mwifiex_fw_dpc’: mwifiex/main.c:520:26: warning: variable ‘priv’ set but not used [-Wunused-but-set-variable] Fixes: bec568ff5107 ("mwifiex: failure path handling in mwifiex_add_virtual_intf()") Cc: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kirtika Ruchandani <kirtika@google.com> --- drivers/net/wireless/marvell/mwifiex/main.c | 3 --- 1 file changed, 3 deletions(-) -- 2.8.0.rc3.226.g39d4020