mwifiex: debugfs: allow card_reset() to cancel things

The card_reset() implementation should be setting our state flags and
cancelling commands for us (i.e., in mwifiex_shutdown_drv()), so let's
not do it here.

Also, this debugfs file is useful for testing and debugging the reset
feature, so we shouldn't do extra preparatory steps here, as that might
cause different reset behavior, which could either cause new bugs or
paper over existing ones that this debug feature should otherwise help
us catch.

Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c
index f6f105a7d3ff4609a094118d3201f91385aa3902..6f4239be609d04fc288813170a2e1ed35784ebb5 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/debugfs.c
+++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c
@@ -940,8 +940,6 @@ mwifiex_reset_write(struct file *file,
 
        if (adapter->if_ops.card_reset) {
                dev_info(adapter->dev, "Resetting per request\n");
-               adapter->hw_status = MWIFIEX_HW_STATUS_RESET;
-               mwifiex_cancel_all_pending_cmd(adapter);
                adapter->if_ops.card_reset(adapter);
        }