From patchwork Wed Feb 15 22:29:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9575205 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 4BC756045F for ; Wed, 15 Feb 2017 22:30:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3961F284B4 for ; Wed, 15 Feb 2017 22:30:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D9942856A; Wed, 15 Feb 2017 22:30:33 +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, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 C37C8284B4 for ; Wed, 15 Feb 2017 22:30:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752777AbdBOWaN (ORCPT ); Wed, 15 Feb 2017 17:30:13 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34328 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752701AbdBOWaJ (ORCPT ); Wed, 15 Feb 2017 17:30:09 -0500 Received: by mail-lf0-f67.google.com with SMTP id q89so19626lfi.1; Wed, 15 Feb 2017 14:30:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mCOqs8gtrrLqGzWqNJKiUKt7zysDwlQiAmIgcH8EjyQ=; b=Jx528rJBRc/Csb7g2klmNNVpWw3BjFWN8SRF2LlTyoSRJKDS/VxudBMdLZcgM1lNcK 2//mzzbdD95jjm+RJU5DwA2XMsuXdjT92rFMVQ8QEoJ/J61pZzQ/mGXeDmziwPH4p0Rg TKVJkUuzicAKOi6jfz4fJIjz1Q+1AYc1ZP8iW2GPwvVk7lqz6skeT/XOI13njC7Pa/HI IQ4WLTiBIifk1NCfjmRJ4gBgKlcTmZZgX/PSivzJtHAlp8NvqpHYFkmvhMV5iSNI+Io2 778r1tS7+UsRo+exjTFTPwTbQWrL3U3FIWI/75MYT1Zo4338VJ3ARlIPTB+VStoJQ3Pg 7QsQ== 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:mime-version:content-transfer-encoding; bh=mCOqs8gtrrLqGzWqNJKiUKt7zysDwlQiAmIgcH8EjyQ=; b=MxT37sWgGXAFn8soVhoiKNqGh00wVPA6CpKHHI+ztgCyKUJqJO+A1rJLktOy2esBqJ zt67P2ObjuF0rG3qTRvvuk4m90NdpJ66Qe2vVd/sbNm62X46ERC+VCmk5qrfYId1Fh7I ic5oFOTCdVuL2gLcLOddSSIRIehf3qasHZOcuhR+l7ENQmL7dIOs6YedHUJdRaZq+5Pu MgpZYQ5a3PyLDxwPRiWWLjlrhG7oAdaFAbPO7pLMWFcodM5N7XGGsOSmnHsGsdaEEy59 D9p8OXTMdx0pLgoWnCMe70gQqXdnPF5kmpD6TIKzbQTSsZ62gZP6uKS8TmKZcaxsjjyc tFtg== X-Gm-Message-State: AMke39klsek/JuKThrWm+KdQBZ/uLK47hqadhH2+v1cAX+ATw5Dewpe1wN3FhLEfDG2brA== X-Received: by 10.25.29.195 with SMTP id d186mr12258256lfd.72.1487197807468; Wed, 15 Feb 2017 14:30:07 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id p33sm1265189lfg.47.2017.02.15.14.30.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 14:30:06 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Ming Lei , "Luis R . Rodriguez" , Greg KH , Linux Kernel Mailing List Cc: Kalle Valo , Arend van Spriel , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 2/2] brcmfmac: don't warn user if loading firmware file with NVRAM fails Date: Wed, 15 Feb 2017 23:29:48 +0100 Message-Id: <20170215222948.21030-2-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170215222948.21030-1-zajec5@gmail.com> References: <20170215222948.21030-1-zajec5@gmail.com> MIME-Version: 1.0 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 From: Rafał Miłecki This isn't critical as we use platform NVRAM as fallback and it's very common case of all Broadcom home routers. Thanks for the new firmware loading function we can achieve this by simply passing FW_OPT_NO_WARN. Signed-off-by: Rafał Miłecki --- Kalle, Arend: this patch is strictly related to the bigger 1/2. Could you ack this change as I expect this patchset to be picked by Ming, Luis or Greg. --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index c7c1e9906500..26ec445a8d2d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -504,9 +504,9 @@ static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx) return; } fwctx->code = fw; - ret = request_firmware_nowait(THIS_MODULE, true, fwctx->nvram_name, - fwctx->dev, GFP_KERNEL, fwctx, - brcmf_fw_request_nvram_done); + ret = request_firmware_async(THIS_MODULE, FW_OPT_NO_WARN, + fwctx->nvram_name, fwctx->dev, GFP_KERNEL, + fwctx, brcmf_fw_request_nvram_done); if (!ret) return;