Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp399066pxb; Tue, 1 Feb 2022 02:17:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8DckRpZIbd0pGFsrB+vCo7hvsDS1ZwG/cz8WzxLMBG3yTXWOgn4jJr5ZKzYc9jCTxREEX X-Received: by 2002:a17:902:db0a:: with SMTP id m10mr24719042plx.92.1643710660300; Tue, 01 Feb 2022 02:17:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643710660; cv=none; d=google.com; s=arc-20160816; b=OUk8/r91G6FJ6n0hdOtbUmTrNt4I/1/Seuh9FceSEgd6njCn+uTcpFzkumWnTAGMOF n917lOBhXyfnefQ/7q6ZEtTkMgAbblrg2JSaub7s6kE8ia3i/MXjvxSoi+nLMDpRsGLj 6dRHqmFcS+9/0MAtfBGHB5O7MrFBPAsZysNxKLUporLtfsN4Yivw8Y6HerJ7Y2i/UaIU BDRX+OReiVlk4AvJipzdpjKGquqO1TlF/LhI9cXiK31DMp249+/fa4EWavDS9WYiC6Qj 677Hy6DcO8XOtgVb8XfaNB/NJJ0a2h0odx6Z6uRoKIebPqRIozC6KSQx7d40QXaKYHQo JuYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=N8bWjUpp+b5Eo8vN2NLohles6TxyH8FdcsO58KsgPyU=; b=yvXPyzTc481xSQffAiepuclgGo3iEpDJWAyBjuY9HCMCKX3ydGhDBMSzE3F0vfu7ve p/4B+3GF/FnPVrQtDfjMDR4jR/b9kZj3vCNdQXSHPgzKt2DyRWl+1EiGJSZC6thi882q mCjSSaY4uuaHUyz+DP297R5vzcd3QkupGpVEIQrqQnWY1qALKAQB2IAFTVR8i29Ebm4+ 306qWcDUU8AKBqZf/8dgnEFXTvoBQU7rAMd+1w597rGDwEKICMoGSrRb5ljgYbNFY9o+ 3WhNuKHREyDWnPpfCjKRDe9bJS/c2kasxcoQN2JH0Zwi5z9+iHTKtt3zMToMuPU8vuDX 0tug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y2si16074375pfi.316.2022.02.01.02.17.30; Tue, 01 Feb 2022 02:17:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354543AbiA3JxP (ORCPT + 71 others); Sun, 30 Jan 2022 04:53:15 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:37904 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S235729AbiA3JxO (ORCPT ); Sun, 30 Jan 2022 04:53:14 -0500 Received: from 91-156-4-210.elisa-laajakaista.fi ([91.156.4.210] helo=kveik.lan) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1nE6tT-0003JO-Ac; Sun, 30 Jan 2022 11:53:12 +0200 From: Luca Coelho To: kvalo@kernel.org Cc: luca@coelho.fi, linux-wireless@vger.kernel.org Date: Sun, 30 Jan 2022 11:52:59 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130095306.790573-1-luca@coelho.fi> References: <20220130095306.790573-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH 05/12] iwlwifi: fw: make dump_start callback void Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg We never return errors there, so just make it void. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 5 ++--- drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index 6e090f10b8eb..0a5d860e489e 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2939,9 +2939,8 @@ void iwl_fw_error_dump_wk(struct work_struct *work) /* assumes the op mode mutex is locked in dump_start since * iwl_fw_dbg_collect_sync can't run in parallel */ - if (fwrt->ops && fwrt->ops->dump_start && - fwrt->ops->dump_start(fwrt->ops_ctx)) - return; + if (fwrt->ops && fwrt->ops->dump_start) + fwrt->ops->dump_start(fwrt->ops_ctx); iwl_fw_dbg_collect_sync(fwrt, wks->idx); diff --git a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h index 3cb0ddbe3ab2..afc822cab674 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h @@ -16,7 +16,7 @@ #include "fw/acpi.h" struct iwl_fw_runtime_ops { - int (*dump_start)(void *ctx); + void (*dump_start)(void *ctx); void (*dump_end)(void *ctx); bool (*fw_running)(void *ctx); int (*send_hcmd)(void *ctx, struct iwl_host_cmd *host_cmd); diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index 86dd2dc1a8ab..98326d06b3a9 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -639,13 +639,11 @@ static void iwl_mvm_tx_unblock_dwork(struct work_struct *work) mutex_unlock(&mvm->mutex); } -static int iwl_mvm_fwrt_dump_start(void *ctx) +static void iwl_mvm_fwrt_dump_start(void *ctx) { struct iwl_mvm *mvm = ctx; mutex_lock(&mvm->mutex); - - return 0; } static void iwl_mvm_fwrt_dump_end(void *ctx) -- 2.34.1