From patchwork Tue Jul 25 01:13:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9860997 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 3719C6038C for ; Tue, 25 Jul 2017 01:18:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27ACB283BF for ; Tue, 25 Jul 2017 01:18:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C846285A2; Tue, 25 Jul 2017 01:18:11 +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 B1F3C283BF for ; Tue, 25 Jul 2017 01:18:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932278AbdGYBSH (ORCPT ); Mon, 24 Jul 2017 21:18:07 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:33996 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756760AbdGYBOU (ORCPT ); Mon, 24 Jul 2017 21:14:20 -0400 Received: by mail-pf0-f181.google.com with SMTP id q85so53114359pfq.1 for ; Mon, 24 Jul 2017 18:14:20 -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=iR7wd2g/PAgEVBk0EJmmqgzxcBayTRK24Z+J93m1NPg=; b=e3LISarHfJ/WlcTOOQ8iIjnRXvNf27mblgURji8DOZVuzT3TG3I6p3MJ1XGjYLD+AT MR7dljKVmUy1BTgJRb3w2yaXM134W92CGt6lDbdr1iHxT1UtCoPUOZeBFHhNDUurhHXJ V6/xmEIKVcYxO0whXNhVpKDKfUxWzHKvaBCgQ= 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=iR7wd2g/PAgEVBk0EJmmqgzxcBayTRK24Z+J93m1NPg=; b=DQQSittBi+0nKX/HCm5SkRTWQbBQFLedUXcEJ8TWNcWNZ9DSsL7qnPtRY38LgR/3Xa +vGLJmDJcAkvhttGPWoQpd5PmLuH9SoWCjt6soSaRcJCwY7r95g3xZAa6PIxUiRxhlKD +1bSD0zU2Kzhrqfxc+oU8e22ohteh7b4QuQqisGGfnyIwpmzIqaJ8sPOIsRSO2EFvCni BzrWH7SSM390+PEwYBeJ4JnLxPly8cZDXtLOpf2dEyUBg20komSYI67OCQhVkPzeOde6 dbV4rY89KAdmvZH0UysbUVvsKJ2HjQSrgDT2j2Ob4iucUtSOmq7oqq8G5lsimxtNH18f i5VA== X-Gm-Message-State: AIVw112D7NYztmAW1OIeuMJ1wSv3H6ueXyXx4snYTnh5w+jOxdZ8iUZL h+KLQZuukqW0XNqH X-Received: by 10.84.141.3 with SMTP id 3mr20165219plu.221.1500945260308; Mon, 24 Jul 2017 18:14:20 -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.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Jul 2017 18:14:19 -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 10/20] mwifiex: make mwifiex_free_cmd_buffer() return void Date: Mon, 24 Jul 2017 18:13:26 -0700 Message-Id: <20170725011336.99993-11-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 doesn't fail. Signed-off-by: Brian Norris --- new in v2; noticed when reworking driver --- drivers/net/wireless/marvell/mwifiex/cmdevt.c | 6 ++---- drivers/net/wireless/marvell/mwifiex/main.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c index 8dad52886034..6ff8e84b01e0 100644 --- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c +++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c @@ -427,7 +427,7 @@ int mwifiex_alloc_cmd_buffer(struct mwifiex_adapter *adapter) * The function calls the completion callback for all the command * buffers that still have response buffers associated with them. */ -int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter) +void mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter) { struct cmd_ctrl_node *cmd_array; u32 i; @@ -436,7 +436,7 @@ int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter) if (!adapter->cmd_pool) { mwifiex_dbg(adapter, FATAL, "info: FREE_CMD_BUF: cmd_pool is null\n"); - return 0; + return; } cmd_array = adapter->cmd_pool; @@ -464,8 +464,6 @@ int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter) kfree(adapter->cmd_pool); adapter->cmd_pool = NULL; } - - return 0; } /* diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index 62ce4e81f695..2bee5cdf1fc8 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -1077,7 +1077,7 @@ int mwifiex_get_debug_info(struct mwifiex_private *, struct mwifiex_debug_info *); int mwifiex_alloc_cmd_buffer(struct mwifiex_adapter *adapter); -int mwifiex_free_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);