From patchwork Tue Jul 25 01:13:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9860965 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 C259A603F9 for ; Tue, 25 Jul 2017 01:16:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4BEE283BF for ; Tue, 25 Jul 2017 01:16:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A98B6285DB; Tue, 25 Jul 2017 01:16:50 +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=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 248F42858E for ; Tue, 25 Jul 2017 01:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756943AbdGYBQH (ORCPT ); Mon, 24 Jul 2017 21:16:07 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:35771 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756803AbdGYBO2 (ORCPT ); Mon, 24 Jul 2017 21:14:28 -0400 Received: by mail-pg0-f51.google.com with SMTP id v190so64053056pgv.2 for ; Mon, 24 Jul 2017 18:14:28 -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=iBOYSz72W9wfLMzVaR8nz1wM1bPQC4ClEOfyJ1OTCq8=; b=Hf9H9q765jMRcnQvqt+CLeOtPyLD54dQ7+Afxsb0bfmFkeRvDIdp0TcQY+2fRdNp58 wzuM+/Le9YugKEuUsC0uHV4D6/8UVicYgbXRF+jf/Q+ipquZjO4yy8ubIgPDeLRv26LV Ggp22dnQs+4K3F37QIA6OSQxK6ssE3PnCSXW4= 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=iBOYSz72W9wfLMzVaR8nz1wM1bPQC4ClEOfyJ1OTCq8=; b=Kdv4PrABowJsU6sGVXXc88CUTO7Jr/PNwBhDwrj0IWoKtziZewDOYRtKGbvMyw1RLD qlmilQvKrhCQ+n+GwqtaSXTceo6L97Tv1KXz3syUpY+/+qLYbtMbqveBEsTslr3mbzgX ww8R+k9g2IIS3JkYRjJqersoW8XhirFUgWIbtmchc5bylV9NPv47puqTLoOHmeHq5aQC QHxlS0FmpKQOpdjk34sIwCyUq+FiCFgXho5Vpw6TcMWtK5gPwtuh5wn03joIxHiN9eA1 B1KgUIuhSkcrBknfJwWevfeCSmgQ+Zaa7t3GJ6+Dvnu3Zdg6AUTVdRI0eR6CHO4yxdOz tkoA== X-Gm-Message-State: AIVw113Lxpf002wlvAkUsJJgopQrL8eWJ97eTsKFdtzxjrOB6kIRpUhf 3aNbAPsjObSZd8aA X-Received: by 10.84.167.2 with SMTP id c2mr19951685plb.370.1500945268038; Mon, 24 Jul 2017 18:14:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Jul 2017 18:14:27 -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 19/20] mwifiex: keep mwifiex_cancel_pending_ioctl() static Date: Mon, 24 Jul 2017 18:13:35 -0700 Message-Id: <20170725011336.99993-20-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 It has some scary comments about "only being called" from the timeout handler, so let's help keep it that way. Signed-off-by: Brian Norris --- new in v2 --- drivers/net/wireless/marvell/mwifiex/cmdevt.c | 4 +++- drivers/net/wireless/marvell/mwifiex/main.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c index 3f5e822673bf..0edc5d621304 100644 --- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c +++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c @@ -26,6 +26,8 @@ #include "11n.h" #include "11ac.h" +static void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter); + /* * This function initializes a command node. * @@ -1074,7 +1076,7 @@ mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter) * In case of scan commands, all pending commands in scan pending queue * are cancelled. */ -void +static void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter) { struct cmd_ctrl_node *cmd_node = NULL; diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index 909bd1ad3838..537a0ad795ff 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -1080,7 +1080,6 @@ int mwifiex_alloc_cmd_buffer(struct mwifiex_adapter *adapter); void mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter); void mwifiex_free_cmd_buffers(struct mwifiex_adapter *adapter); void mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter); -void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter); void mwifiex_cancel_pending_scan_cmd(struct mwifiex_adapter *adapter); void mwifiex_cancel_scan(struct mwifiex_adapter *adapter);