From patchwork Fri Mar 16 10:11:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 10286845 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7FFE0602C2 for ; Fri, 16 Mar 2018 10:12:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F76B28E0A for ; Fri, 16 Mar 2018 10:12:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6435228E0F; Fri, 16 Mar 2018 10:12:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B0CE28E0A for ; Fri, 16 Mar 2018 10:12:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753181AbeCPKMO (ORCPT ); Fri, 16 Mar 2018 06:12:14 -0400 Received: from rnd-relay.smtp.broadcom.com ([192.19.229.170]:46110 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753155AbeCPKMJ (ORCPT ); Fri, 16 Mar 2018 06:12:09 -0400 Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.224.233]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 9168D30C011; Fri, 16 Mar 2018 03:11:35 -0700 (PDT) Received: from bld-bun-01.bun.broadcom.com (bld-bun-01.bun.broadcom.com [10.176.128.83]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id 7982781EC8; Fri, 16 Mar 2018 03:11:35 -0700 (PDT) Received: by bld-bun-01.bun.broadcom.com (Postfix, from userid 25152) id 70AA5B05208; Fri, 16 Mar 2018 11:11:32 +0100 (CET) From: Arend van Spriel To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Arend van Spriel Subject: [PATCH 11/12] brcmfmac: get rid of brcmf_fw_get_full_name() Date: Fri, 16 Mar 2018 11:11:24 +0100 Message-Id: <1521195085-439-12-git-send-email-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521195085-439-1-git-send-email-arend.vanspriel@broadcom.com> References: <1521195085-439-1-git-send-email-arend.vanspriel@broadcom.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The function was pretty minimal and now it is called only from one place so just get rid of it. Signed-off-by: Arend van Spriel --- .../net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index 1ea9451..486d771 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -628,13 +628,6 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req, return 0; } -static void brcmf_fw_get_full_name(char fw_name[BRCMF_FW_NAME_LEN], - const char *fw_base, const char *extension) -{ - strlcat(fw_name, fw_base, BRCMF_FW_NAME_LEN); - strlcat(fw_name, extension, BRCMF_FW_NAME_LEN); -} - struct brcmf_fw_request * brcmf_fw_alloc_request(u32 chip, u32 chiprev, struct brcmf_firmware_mapping mapping_table[], @@ -685,9 +678,10 @@ struct brcmf_fw_request * BRCMF_FW_NAME_LEN); } } - brcmf_fw_get_full_name(fwnames[j].path, - mapping_table[i].fw_base, - fwnames[j].extension); + strlcat(fwnames[j].path, mapping_table[i].fw_base, + BRCMF_FW_NAME_LEN); + strlcat(fwnames[j].path, fwnames[j].extension, + BRCMF_FW_NAME_LEN); fwreq->items[j].path = fwnames[j].path; }