mwifiex: pcie: stop setting/clearing 'surprise_removed'

These are already handled by mwifiex_shutdown_sw() and
mwifiex_reinit_sw(). Ideally, we'll kill the flag entirely eventually,
as I suspect it breeds race conditions.

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

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index be5050a536e18685b359dda857187f48c6fac2f7..394224d6c2192b80799a141603e2d330222593dc 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -370,7 +370,6 @@ static void mwifiex_pcie_reset_notify(struct pci_dev *pdev, bool prepare)
                 * PCIe and HW.
                 */
                mwifiex_shutdown_sw(adapter);
-               adapter->surprise_removed = true;
                clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags);
                clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags);
        } else {
@@ -378,7 +377,6 @@ static void mwifiex_pcie_reset_notify(struct pci_dev *pdev, bool prepare)
                 * after performing FLR respectively. Reconfigure the software
                 * and firmware including firmware redownload
                 */
-               adapter->surprise_removed = false;
                ret = mwifiex_reinit_sw(adapter);
                if (ret) {
                        dev_err(&pdev->dev, "reinit failed: %d\n", ret);