Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp634747pxj; Wed, 2 Jun 2021 07:45:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx41UoAedBtx4JzxUMEWb4+F2ISr/UDhM8k/BFZ034Orqpem2N0VSoucwzgdIcg8hJS/58z X-Received: by 2002:a17:906:35ca:: with SMTP id p10mr419179ejb.535.1622645129185; Wed, 02 Jun 2021 07:45:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622645129; cv=none; d=google.com; s=arc-20160816; b=bnAB/w9tajCxOnOUA4+5LlE3RQhe3w9iVGU+yUUg4CfIyF3Zc0w1wWtcQw7f99eFK0 evTr/7dpYPUm1q7mRkLyJER0Er5viJMvC31odibYTYZVvh1//azm4x5lADxiWmtzAmRI DnhG59TME8dsB/J/fIPYZllZJdwJ6V/NOKXfZsgq8CahoSKGuyDKKaLJrJYTCaV5rl9W eU2l2AA+in5sV/VEKHTJA9FVdJyFoUbfOEv/tqw6CJcsOgdR5fY53tPkSJXm8Z6KhBcG Cu7I/elUE+gKMoch7AlwPVCS5HCQK0pmMcvle9z6eH/HPpCvRPHbtQkJpjZIs4/i+9Gm UyGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=/niyd6vfOh4C/7+B28oIKmkZtpYRwhgd3mQFukqZWOY=; b=jaZNCuw8zHDdt4A+0YIgGXiwPSXm+K6UQcpOkkvlCnKZQHrkQdSd28Pz665+Hjda6l p5uMJkF2iDdFu9Ab6hosgDNEl5lUgKd28BAuaBKK0az6+syLZXC5B2FnOMfj6VohNP+A ieXO3OIW1odxpqp6Bet8/OivJf3wn/Ro2ep8iX58WuMGDXZ/8EwPhcygpB2sz+uN7Fhi RMQb7uKSPVSvOd+8jptvvhS2AP7Bm+UonbaF7eDZzvh+NjkWEAmsD37n7WO1aAgUlQV2 jXrrZg0/LH5jGR3VjDkJmhOsR2JJvjPtWgkdyxiUa8D49DZeozyYsYO/TZBc8yrbBruS v9qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=E5hNuZK0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q20si39366ejb.629.2021.06.02.07.45.05; Wed, 02 Jun 2021 07:45:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=E5hNuZK0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230300AbhFBOpD (ORCPT + 99 others); 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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), -- 2.31.1