From patchwork Sat May 20 20:33:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Stromdahl X-Patchwork-Id: 9738765 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 C1C526041F for ; Sat, 20 May 2017 20:34:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4727285E1 for ; Sat, 20 May 2017 20:34:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9571285E2; Sat, 20 May 2017 20:34:09 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 53F2C285E2 for ; Sat, 20 May 2017 20:34:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756318AbdETUeH (ORCPT ); Sat, 20 May 2017 16:34:07 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36179 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756264AbdETUeC (ORCPT ); Sat, 20 May 2017 16:34:02 -0400 Received: by mail-lf0-f68.google.com with SMTP id h4so2393485lfj.3 for ; Sat, 20 May 2017 13:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QK+/rMwb2sIhwgFOHwTVHREqgYIMmxWyZlaL0y8FwX8=; b=rPoQ57PeHV9pkVFBDF/tcd/vGYJkTqS75frBNHldBMG+MTG96tsVFSEj8GmDd/efwe OnCSun2uJGpaz52zmw84r8xRFyleP918ViGH90gT0McVPnajc1JWPWMdIz/f0NFr9bUx spN7bmWkXFnOF15Y8hu/OmcofQAAvcfVJAFuHrn+/UD0yiNsLRtqBzliQbEkxDZiun1k FxGn2SeG0+mm/l6Tk45XzrxhsEtt9apexQ2ErNqQeJ4EA4UM9tWgeKPBhbzqs0HuHZGu Hx276amIHv/CYwiVRg/J8qcx6xrgWbWjRFGWHhOMNkT424EPT9dnQi/LH5VY4+KvUXKb jrZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QK+/rMwb2sIhwgFOHwTVHREqgYIMmxWyZlaL0y8FwX8=; b=AKaj06ufCHV+PC3OPWa3PPFR2Mh97TCktP5NVKSQlpUPCUxQdkVkOz4JkIi+TOtfHL BnseZfxI5A/kJME+AmOA6O889mdH7u00cJen990awzcDF0dNwAgaZIxjC13Wz3m0DJ2h G7kjJ6FVOkaCbdFiYY+1DchYGeVpiznhjebjnORzSjbww2FjZnAi6baJSh93gGEZ+Jdn 4ow+EVwfttjfUoUwF5BnoEfihEigT/GEHV3IiJmdK6WSoLQKWsl6KJcbHp60V2Med8L8 nNiW2bC24GQS+++hqFGEBhJkbVWy5ZGupYGTVEaTNdsqgRv5IViiP7ogN5pgmUVcSum7 VVpw== X-Gm-Message-State: AODbwcD7yeF/lvaMdvj/xV0KEB7ibArK/1NER1+kxFqAWFw2GOQKwzUl UNbdK8dIDndMUZ40R10= X-Received: by 10.25.201.145 with SMTP id z139mr3967212lff.172.1495312439838; Sat, 20 May 2017 13:33:59 -0700 (PDT) Received: from erik-mate-1604.lan (90-227-62-61-no75.tbcn.telia.com. [90.227.62.61]) by smtp.gmail.com with ESMTPSA id l185sm1669230lfe.30.2017.05.20.13.33.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 20 May 2017 13:33:59 -0700 (PDT) From: Erik Stromdahl To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Cc: Erik Stromdahl Subject: [RFC v2 2/3] ath10k: different fw file names for usb Date: Sat, 20 May 2017 22:33:29 +0200 Message-Id: <1495312410-9937-3-git-send-email-erik.stromdahl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495312410-9937-1-git-send-email-erik.stromdahl@gmail.com> References: <1495312410-9937-1-git-send-email-erik.stromdahl@gmail.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 USB firmware will be named in the same way as SDIO files, i.e, the bus type will be added to the firmware file name. Signed-off-by: Erik Stromdahl --- drivers/net/wireless/ath/ath10k/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index eea111d..46ce263 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1412,6 +1412,7 @@ static void ath10k_core_get_fw_name(struct ath10k *ar, char *fw_name, { switch (ar->hif.bus) { case ATH10K_BUS_SDIO: + case ATH10K_BUS_USB: scnprintf(fw_name, fw_name_len, "%s-%s-%d.bin", ATH10K_FW_FILE_BASE, ath10k_bus_str(ar->hif.bus), fw_api);