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.
Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
Signed-off-by: Hector Martin <marcan@xxxxxxxxx>
---
.../broadcom/brcm80211/brcmfmac/firmware.c | 35 ++++++++++++-------
.../broadcom/brcm80211/brcmfmac/firmware.h | 2 +-
.../broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-
.../broadcom/brcm80211/brcmfmac/sdio.c | 2 +-
4 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
index 7570dbf22cdd..054ea3ed133e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -594,28 +594,39 @@ static int brcmf_fw_complete_request(const struct firmware *fw,
return (cur->flags & BRCMF_FW_REQF_OPTIONAL) ? 0 : ret;
}
-static int brcm_alt_fw_paths(const char *path, const char *board_type,
+static int brcm_alt_fw_paths(const char *path, struct brcmf_fw *fwctx,
const char *alt_paths[BRCMF_FW_MAX_ALT_PATHS])
{
+ const char **board_types = fwctx->req->board_types;
+ unsigned int i;
char alt_path[BRCMF_FW_NAME_LEN];
const char *suffix;
memset(alt_paths, 0, array_size(sizeof(*alt_paths),
BRCMF_FW_MAX_ALT_PATHS));
+ if (!board_types[0])
+ return -ENOENT;
+
suffix = strrchr(path, '.');
if (!suffix || suffix == path)
return -EINVAL;
- /* strip extension at the end */
- strscpy(alt_path, path, BRCMF_FW_NAME_LEN);
- alt_path[suffix - path] = 0;
+ for (i = 0; i < BRCMF_FW_MAX_ALT_PATHS; i++) {
+ if (!board_types[i])
+ break;
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature