From patchwork Tue Jul 25 01:13:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9860981 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 583D96038F for ; Tue, 25 Jul 2017 01:17:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48609285EE for ; Tue, 25 Jul 2017 01:17:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D2E7285DE; Tue, 25 Jul 2017 01:17:51 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham 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 D0834285EE for ; Tue, 25 Jul 2017 01:17:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757097AbdGYBRm (ORCPT ); Mon, 24 Jul 2017 21:17:42 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:34283 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756570AbdGYBO0 (ORCPT ); Mon, 24 Jul 2017 21:14:26 -0400 Received: by mail-pg0-f54.google.com with SMTP id 123so64047721pgj.1 for ; Mon, 24 Jul 2017 18:14:25 -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=7vY3p+XSlV7qWuWdJZncvoOmJpVGuM+cZhoNse7nfDE=; b=bRTftMpLm5a7ACInEkQa3DcLM1HKkqKlFdeKZ1AeYxGl+TQMKAWga1A+Vj/Pwhj+J6 ActOHe6TDV99vftN8BGHhojEG9HlI8qVHMtfBYpIDq6dy0jO9YdQ4+oWT8Fbk6p2EPPd eU0SZy4ZCSGNzXaoinw3h4ZFTbLXZDuoSGKVA= 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=7vY3p+XSlV7qWuWdJZncvoOmJpVGuM+cZhoNse7nfDE=; b=p9TUvIii8TIg/XKtGamfuydcp9Zwmjm5aH38ee0wbu10WjkapTwaghruRDJnZXRQOB FRcCgjT2ZfGRUMAgIv6z/hOVtr9b4Wfgyl+NW3LzhWSXsIS1bFXGHwW9XEnaaH25gZsK tM/oMyYqY4+wHAwh7x7aAQ0W13Z3K68/MFaA3lshWhkNaRrIUwwHtQht+0z+QFzA6i1/ BbRIysASVyGvGzQ7AYYBY4frou+CS5CzmWmfRaS5jReKyhMc0ynn7zb1uPWDjkv8w/TD GDMorx8mfUbKskN95WofXn9bh80Ibv2wHQ8eq5U3vfs81dU8AZGdydhR2D674sKKF0+o c2Lw== X-Gm-Message-State: AIVw113uerBhr2oT8LYlS68dN7KCuFVn8zqZVPNOqmMfaeuI+HPqBf4q +yyw8nZIPBGOkefo X-Received: by 10.98.12.78 with SMTP id u75mr6904707pfi.18.1500945265544; Mon, 24 Jul 2017 18:14:25 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.113.17]) by smtp.gmail.com with ESMTPSA id h123sm21497036pgc.36.2017.07.24.18.14.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Jul 2017 18:14:25 -0700 (PDT) From: Brian Norris To: Ganapathi Bhat , Nishant Sarmukadam Cc: , Dmitry Torokhov , Amitkumar Karwar , Kalle Valo , linux-wireless@vger.kernel.org, Brian Norris Subject: [PATCH v2 16/20] mwifiex: debugfs: allow card_reset() to cancel things Date: Mon, 24 Jul 2017 18:13:32 -0700 Message-Id: <20170725011336.99993-17-briannorris@chromium.org> X-Mailer: git-send-email 2.14.0.rc0.284.gd933b75aa4-goog In-Reply-To: <20170725011336.99993-1-briannorris@chromium.org> References: <20170725011336.99993-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 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 --- new in v2 --- drivers/net/wireless/marvell/mwifiex/debugfs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c index f6f105a7d3ff..6f4239be609d 100644 --- 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); }