summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/marvell/mwifiex
diff options
context:
space:
mode:
authorBrian Norris <briannorris@chromium.org>2017-05-12 09:42:05 -0700
committerKalle Valo <kvalo@codeaurora.org>2017-05-19 09:01:58 +0300
commit7170862738dc129d98f8ea99f28b2d0d133365eb (patch)
tree5d91b2fa9e956f652c9c0bc31da219893de7900b /drivers/net/wireless/marvell/mwifiex
parentbc69ca391eff0de1fb57066a5407d59723ed2da5 (diff)
downloadtalos-obmc-linux-7170862738dc129d98f8ea99f28b2d0d133365eb.tar.gz
talos-obmc-linux-7170862738dc129d98f8ea99f28b2d0d133365eb.zip
mwifiex: remove redundant 'adapter' check in mwifiex_adapter_cleanup
We're using 'adapter' right before calling this. Stop being unnecessarily paranoid. Signed-off-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex')
-rw-r--r--drivers/net/wireless/marvell/mwifiex/init.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index 2bff87bd76a6..80bdf1c5f77f 100644
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c
@@ -409,11 +409,6 @@ static void mwifiex_free_lock_list(struct mwifiex_adapter *adapter)
static void
mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
{
- if (!adapter) {
- pr_err("%s: adapter is NULL\n", __func__);
- return;
- }
-
del_timer(&adapter->wakeup_timer);
mwifiex_cancel_all_pending_cmd(adapter);
wake_up_interruptible(&adapter->cmd_wait_q.wait);
OpenPOWER on IntegriCloud