Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp643679pxj; Wed, 2 Jun 2021 07:58:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAS3f/I3QsUhhK0p30zszWV2JN3wRVIVVHq5Hypr5T6kyQ6S8uBJhomXfXtdFgAtqBCTDB X-Received: by 2002:a50:ee18:: with SMTP id g24mr10026552eds.11.1622645922465; Wed, 02 Jun 2021 07:58:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622645922; cv=none; d=google.com; s=arc-20160816; b=hF323mWdXJWu39kSsf+JLMICUWWO/8xktYTnaa3/jqT11T7ByxTMvTYZ0FCd5MynzV 45ukutQFXseK7A7c/J7N2+9ErZ6q0opnY9LwBydnljbcoGiXg0RS3fo4ZACfSRs/0FjY Y0BcrmhDBQK1lnuA5q/ffpIRkG8s0hVUXkHOoK9q4PRSNZrCOBX2BO1m5USDE/YhkJFz nDswP5we46icXBp4KiWIFFV6K38xhjNrZkjA8uKHK8sh7rYI0bCa0ZxB9zdt6p0FshLF vgur2LAyrk3gyTQrREqtkTV5x79j5gKJLvxQPtPkx5qYQXrTWQRi4ValKPNv1ErpAIc3 65aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=TMcD5cH8Gq97lrhqQCtDsFyiGiLKX1rySB5M/G3UShE=; b=N7okalfV2sqHrp44ZP/YQaFcbPgkwli0QxZXy5qPSfpiHR6Dqk70I/TvssWT7COhnK ANEgq3UUqyCDb9XmEGtVKQnlE3b2yrXa9UQrz53nrUD4CjdjSecWHHkpdXC6RScGE4cO td4SVk8nCjLxtsuhjguZOEdalsm5UaVhR2+1SkmdbJk0RCEr4BxtnMhJSN9D0r4Jt2Oz W2TNxvR/BA32MJkBf4fAUJwu67UGio4u96Zbl83atmEvhUOPX8w6jKTOu0AK10+hWVbd 7D/NkCEovRKUFkxO3qdHWBEemG+Yr6q9qMIYA+jeAF8J8Dk4wK0HqGTBuiEC4q13MlrZ aRIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YZ7mnP8z; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 19si71726ejx.529.2021.06.02.07.58.17; Wed, 02 Jun 2021 07:58:42 -0700 (PDT) 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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YZ7mnP8z; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231474AbhFBO62 (ORCPT + 99 others); Wed, 2 Jun 2021 10:58:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24866 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231222AbhFBO61 (ORCPT ); Wed, 2 Jun 2021 10:58:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622645804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TMcD5cH8Gq97lrhqQCtDsFyiGiLKX1rySB5M/G3UShE=; b=YZ7mnP8zT55k8RQDTHuUIHpY4ix65F62WA5beEjKyJ8AY7wl5sMI/asqNX4sf6Bqn8UDiz LAFPd1lYvRd6Q8DPUNW7KIUysdwTJUsst6qOuurW/Wc3PxRerRUpLr4DIVWfoDJzPkgHDl yQ+Pp8YO4XyIBPlLqhNiv9H8GLH9cBA= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-594-etku91f3PSW39vFUNDYFpg-1; Wed, 02 Jun 2021 10:56:40 -0400 X-MC-Unique: etku91f3PSW39vFUNDYFpg-1 Received: by mail-ed1-f70.google.com with SMTP id d8-20020a0564020008b0290387d38e3ce0so1581913edu.1 for ; Wed, 02 Jun 2021 07:56:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=TMcD5cH8Gq97lrhqQCtDsFyiGiLKX1rySB5M/G3UShE=; b=fDLT6u6HoEpLTciut2zwBGN4Q+TTFwsqOkNa0tyglCsHi2cKX0RsWsgs26AriucGg6 hJfGCQ8ThL5LdEAc2PNz0MpSvATRWxffmW7jG4tjmt50/g5CbMAfZVlrRTvbcISx8ViJ 1iwgL7IXTbWoOSzxwELY0EpDt/fLLyoshOhU7W4+q5gGDj44J5l0Oq3M+8dv1l45AuIv 1tIUbJ6CK0x7xv/1AlxzMprUPfq1vAKs6lKtQ1E2YRxpZnmCRZupk7ORa3YZ9zje5BOd /BGIJq27LI6SGtw6HJ23Yw/BGmI9fJ3q4MIwbnoDfUxkH+TNdXcGIVfdS9rpSiMkYCCF Pb6g== X-Gm-Message-State: AOAM53190AsIta6aMIiuoV7fttd1gG+yrgOAy7J2h0oz96T5sHqhkZxB jal2TvByAupGYp6MNPMR3cpIr+OIb7PTMy1ml6NC4OyXbsy9JV3Tz4+mvxlWr5MvkU6itlNGEZy A4HpUVZWEfc6CMdv4xKYjGrAOICI= X-Received: by 2002:aa7:cd19:: with SMTP id b25mr37414291edw.84.1622645799648; Wed, 02 Jun 2021 07:56:39 -0700 (PDT) X-Received: by 2002:aa7:cd19:: with SMTP id b25mr37414281edw.84.1622645799426; Wed, 02 Jun 2021 07:56:39 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c1e-bf00-1054-9d19-e0f0-8214.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:1054:9d19:e0f0:8214]) by smtp.gmail.com with ESMTPSA id w14sm115661edj.6.2021.06.02.07.56.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Jun 2021 07:56:39 -0700 (PDT) Subject: Re: [PATCH] brcmfmac: Delete second brcm folder hierarchy To: matthias.bgg@kernel.org, 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 , Sebastian Andrzej Siewior References: <20210602144305.4481-1-matthias.bgg@kernel.org> From: Hans de Goede Message-ID: Date: Wed, 2 Jun 2021 16:56:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210602144305.4481-1-matthias.bgg@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hi, On 6/2/21 4:43 PM, matthias.bgg@kernel.org wrote: > 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 Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > > --- > > 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), >