From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D37AC43219 for ; Fri, 7 Jan 2022 02:50:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345577AbiAGCun (ORCPT ); Thu, 6 Jan 2022 21:50:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344814AbiAGCum (ORCPT ); Thu, 6 Jan 2022 21:50:42 -0500 Received: from mail.marcansoft.com (marcansoft.com [IPv6:2a01:298:fe:f::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C0A1C061245; Thu, 6 Jan 2022 18:50:42 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: marcan@marcan.st) by mail.marcansoft.com (Postfix) with ESMTPSA id A6A7E4388F; Fri, 7 Jan 2022 02:50:22 +0000 (UTC) Message-ID: Date: Fri, 7 Jan 2022 11:50:20 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: [PATCH v2 06/35] brcmfmac: firmware: Support passing in multiple board_types Content-Language: en-US To: Andy Shevchenko Cc: Kalle Valo , "David S. Miller" , Jakub Kicinski , Rob Herring , "Rafael J. Wysocki" , Len Brown , Arend van Spriel , Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Dmitry Osipenko , Sven Peter , Alyssa Rosenzweig , Mark Kettenis , =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Pieter-Paul Giesberts , Linus Walleij , Hans de Goede , "John W. Linville" , "brian m. carlson" , "open list:TI WILINK WIRELES..." , netdev , devicetree , Linux Kernel Mailing List , ACPI Devel Maling List , "open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER" , SHA-cyfmac-dev-list@infineon.com References: <20220104072658.69756-1-marcan@marcan.st> <20220104072658.69756-7-marcan@marcan.st> From: Hector Martin In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 2022/01/04 20:28, Andy Shevchenko wrote: > On Tue, Jan 4, 2022 at 9:28 AM Hector Martin wrote: >> >> In order to make use of the multiple alt_path functionality, change >> board_type to an array. Bus drivers can pass in a NULL-terminated list >> of board type strings to try for the firmware fetch. > >> + /* strip extension at the end */ >> + strscpy(alt_path, path, BRCMF_FW_NAME_LEN); >> + alt_path[suffix - path] = 0; >> >> - alt_paths[0] = kstrdup(alt_path, GFP_KERNEL); >> + strlcat(alt_path, ".", BRCMF_FW_NAME_LEN); >> + strlcat(alt_path, board_types[i], BRCMF_FW_NAME_LEN); >> + strlcat(alt_path, suffix, BRCMF_FW_NAME_LEN); >> + >> + alt_paths[i] = kstrdup(alt_path, GFP_KERNEL); >> + brcmf_dbg(TRACE, "FW alt path: %s\n", alt_paths[i]); > > Consider replacing these string manipulations with kasprintf(). > Done, thanks! -- Hector Martin (marcan@marcan.st) Public Key: https://mrcn.st/pub