From patchwork Fri May 12 16:42:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9724601 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 27352601E7 for ; Fri, 12 May 2017 16:43:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1346328854 for ; Fri, 12 May 2017 16:43:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 080492885E; Fri, 12 May 2017 16:43:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05FA028854 for ; Fri, 12 May 2017 16:43:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933295AbdELQmh (ORCPT ); Fri, 12 May 2017 12:42:37 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:35890 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933279AbdELQmf (ORCPT ); Fri, 12 May 2017 12:42:35 -0400 Received: by mail-pg0-f49.google.com with SMTP id x64so13284200pgd.3 for ; Fri, 12 May 2017 09:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZeW9KlGqKuL3dsBHg9mw1qT8DN0DvHK1/dBDLhf6hHg=; b=K6u+A55UWj36LaEp5SB4rdx+iD4bkKUaUm1SkGinTS2OLZ7hOD8q3Nar1aiKbA7DDK wRT+69bz2AlwcqKzjOLBcFjYbGQa4tI9DYBWD2wCwJvjxJMVRF0IzPlwa/UAHqbHC1wS 1ST0IppMG35g23TLciEhqHKs/1er7cg2pyac0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZeW9KlGqKuL3dsBHg9mw1qT8DN0DvHK1/dBDLhf6hHg=; b=Y23sneqcSKerl7yArjjBQk5lGOwwaME6iTRbc6hv+nkZyOcn8Ya1AE9VRtOkrnrXf0 GNjZoDE4m11zFnhW+aOJbWZE+1Pp3fb8mH1GvrZCV/hH4w9Pqw5gc+MYBzP+BUMxxvG1 vYnQYMzYYwbzR2gRLt0+2XBcKuBwmn+VxcrDF0nUe8qc3LeNr7qdouO3XSmOHFN8Rma0 YdWrSydS2b3yTMAmx0rA/0KtRGKHVv+O9O+4qD0h0n1d+bBl/yKAE6GaJGjshnaoKLLU A9Xg7G5ufBgnHPAs8945jxWJeszZO1w1RWAUyGFKr6N17VAk8nU/dU9uQlKDS7ErhBu+ 219w== X-Gm-Message-State: AODbwcAGlnnEsyIJMTVauKPGrsiXKolzyWcZGdA0VK+jlXnNL0mQeWuI 8ZnPxVj2dtPLRpJA X-Received: by 10.99.56.66 with SMTP id h2mr5518789pgn.40.1494607354320; Fri, 12 May 2017 09:42:34 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id u74sm7304499pfk.58.2017.05.12.09.42.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 May 2017 09:42:33 -0700 (PDT) From: Brian Norris To: Ganapathi Bhat , Nishant Sarmukadam Cc: , Dmitry Torokhov , Amitkumar Karwar , Kalle Valo , linux-wireless@vger.kernel.org, Doug Anderson , Brian Norris Subject: [PATCH 11/11] mwifiex: pcie: stop setting/clearing 'surprise_removed' Date: Fri, 12 May 2017 09:42:08 -0700 Message-Id: <20170512164208.38725-11-briannorris@chromium.org> X-Mailer: git-send-email 2.13.0.rc2.291.g57267f2277-goog In-Reply-To: <20170512164208.38725-1-briannorris@chromium.org> References: <20170512164208.38725-1-briannorris@chromium.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/net/wireless/marvell/mwifiex/pcie.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index d7e563a622f7..da042d15f8f0 100644 --- 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);