From patchwork Wed Jun 2 14:43:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 452989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F24CC4708F for ; Wed, 2 Jun 2021 14:43:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79655613E6 for ; Wed, 2 Jun 2021 14:43:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230262AbhFBOpD (ORCPT ); Wed, 2 Jun 2021 10:45:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:60592 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230092AbhFBOpC (ORCPT ); Wed, 2 Jun 2021 10:45:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B7BF9613BF; Wed, 2 Jun 2021 14:43:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622644999; bh=6hYLmEtJfyj17Pk5FCyvFiZi3GRWNPANkuUiPoffKss=; h=From:To:Cc:Subject:Date:From; b=E5hNuZK0bX4AptxU9d0sWXEhSHtZZIajx7yEOTCqFhj2INqGeMoHeL8GYKtb2xunP K2oCd+TOa+cAmRsFfPaQvAXHCsNxvzat4jkXKqbo1/IwmWZhLE//coH4j7DtL5f6R7 KQy9As2urUyiGBJdApPXHmQeyWBZ5sHlzJ/kfC4RZtK9I8YcstyU352/bSk/G80mUS OUx1AX0IXprm99gKWuP0fxDvTV7IlO9b5i20XHGLnBcjncX9mAEXaEYrYx4U/dCuFn YEbM39nbiQ7+ffWTB19KtoWt/s2iJhZ6ONq17a+4fIl8nhESZen1d8Qx+u3Oc/M0Z7 n5f0fAa8wSIxA== From: matthias.bgg@kernel.org To: Kalle Valo , "David S . Miller" , Jakub Kicinski Cc: brcm80211-dev-list.pdl@broadcom.com, Chung-hsien Hsu , netdev@vger.kernel.org, Hante Meuleman , linux-wireless@vger.kernel.org, Amar Shankar , ivan.ivanov@suse.com, linux-kernel@vger.kernel.org, Dmitry Osipenko , SHA-cyfmac-dev-list@infineon.com, Wright Feng , Remi Depommier , Franky Lin , Arend van Spriel , dmueller@suse.de, Matthias Brugger , "Gustavo A . R . Silva" , Chi-hsien Lin , Hans de Goede , Sebastian Andrzej Siewior Subject: [PATCH] brcmfmac: Delete second brcm folder hierarchy Date: Wed, 2 Jun 2021 16:43:05 +0200 Message-Id: <20210602144305.4481-1-matthias.bgg@kernel.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Matthias Brugger BRCMF_FW_DEFAULT_PATH already defines the brcm folder, delete the second folder to match with Linux firmware repository layout. Fixes: 75729e110e68 ("brcmfmac: expose firmware config files through modinfo") Signed-off-by: Matthias Brugger --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 16ed325795a8..b8788d7090a4 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -626,8 +626,8 @@ BRCMF_FW_DEF(4373, "brcmfmac4373-sdio"); BRCMF_FW_DEF(43012, "brcmfmac43012-sdio"); /* firmware config files */ -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-sdio.*.txt"); -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-pcie.*.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt"); +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt"); static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),