From patchwork Mon Apr 23 20:12:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andres Rodriguez X-Patchwork-Id: 10358081 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 41C0260209 for ; Mon, 23 Apr 2018 20:14:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30F3C28C29 for ; Mon, 23 Apr 2018 20:14:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2576328C2D; Mon, 23 Apr 2018 20:14:14 +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=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 856A328C29 for ; Mon, 23 Apr 2018 20:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RhZ28sjCr14fyaq43qgWO08p+ZnoNTZwg8joMVuZ83o=; b=q/0ZXi7/LDt1xe8Yi6wAOk09qg 8/FUaQct4QXwEvSaHBRudfeRJd6N7eB6y9YrtG+NiZs73IBzu7NE4QjXNGUfOpc6P3uIdaGAxjN+V GtbZeGLoCDRWK6knI0jqepXWT7FzpP5wSH5SWojcKj2Cio7fXb5yidTskcjz5dTn5ELcOrIIkC7Y4 R4nvatIaw/yzaq+gpfQBHy62vaE4vd0Tc/eEJlMy5vZp84/tZa6MsyyNXoCA5M/qVELQXTvovWPA3 I9IFq1ICBiIvmb+8F5m9tgXgbEkF+rPRYxLGRIbJELqFTZMEVbYAsKQMixGuc8LZ+m50lhF6lmCEX EhXeYRKg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAhqf-0005h6-6r; Mon, 23 Apr 2018 20:14:05 +0000 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAhpC-0004q5-Um for ath10k@lists.infradead.org; Mon, 23 Apr 2018 20:12:49 +0000 Received: by mail-io0-x241.google.com with SMTP id t23-v6so7050621ioc.10 for ; Mon, 23 Apr 2018 13:12:24 -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=5rD/bAQTEZ5lLAoQ9ShkCtxtXoEReRqM+uz4O205vg4=; b=eCe6XxcrQjRlHRAkYaFORuSUlKukBZPEULmiROWaqENZTcfXYOb42YZg70q3xeuNP8 HGH4lQfzomzxMGhySk49YxfAQ9nlEYiJ1fE7p6m3sAuApTj3FAutSihYpMYn2YwKxzuK msj5NyAeUQSIcGXVIqK1JDvk/GCCJPMVSmwoisrIGrZU2A6SRXcn4hVMHFVTfe1JbUy+ PEa1HoXLDquhmGEXwdE+rxMk+vVfEP6tWZbFv9YRCA+YQcJqt1rXgIj9qTkjBamyl486 AVNONo8RmdNrQwIhbcDPcDdBoxet/kEpwc3wiZIncu21MhnwLr+Xx1H1dGSjerq/dDxn 0fUA== 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=5rD/bAQTEZ5lLAoQ9ShkCtxtXoEReRqM+uz4O205vg4=; b=Gk27OWbbfWCigvIsn23gbGKk8eQD+NMVRMo0B9PvpCHQhF2du451U1dRnjrBSe2+TD eEXLTuC6P8mvCjCpteqwTZIkeQdAAGqdl8xiq6yzo4fbpNt89ZNj5iONbKg/qtEoWUJq /hzSDcNVBGjI76LsQuLHM62mm/d80vMcGQBM6FCihRyJKNm10H0pcyQ/DN8cII5X3DYa INaNYQfmwihl9Vu2rfCxv7v+/anJwpW49T6s59yDwOBEGRk7hl+cy/wp8Ntq5AYWPP47 es6mvzWTMcISMRtPX9Wif9hjvGzBMkI2VOf9HNnTojaEJjbbs80IcOIypJ1HsKobxs2W BVbg== X-Gm-Message-State: ALQs6tB7Uq5XHF0o6dHY+t4M57d3wwkJwDz1w60lkquMcnDzSQMV8sKe mEabNiqvDUBgavwIuwl7R2U= X-Google-Smtp-Source: AIpwx4/8Cu/ii4V7is0BMi+4c11wq2vV1aTj9rz3oRJxX25uIz1Orbamj07lulNTuNviirzPSz3ttQ== X-Received: by 2002:a6b:98b:: with SMTP id 11-v6mr21728573ioj.90.1524514343618; Mon, 23 Apr 2018 13:12:23 -0700 (PDT) Received: from localhost.localdomain (184-175-36-239.dsl.teksavvy.com. [184.175.36.239]) by smtp.gmail.com with ESMTPSA id k130-v6sm1632551itb.0.2018.04.23.13.12.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 13:12:23 -0700 (PDT) From: Andres Rodriguez To: linux-kernel@vger.kernel.org Subject: [PATCH 7/9] firmware: use rename fw_sysfs_fallback to use the firmware_ prefix Date: Mon, 23 Apr 2018 16:12:03 -0400 Message-Id: <20180423201205.20533-8-andresx7@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180423201205.20533-1-andresx7@gmail.com> References: <20180423201205.20533-1-andresx7@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180423_131235_077353_50E8C808 X-CRM114-Status: GOOD ( 13.10 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arend.vanspriel@broadcom.com, gregkh@linuxfoundation.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, hdegoede@redhat.com, mcgrof@kernel.org, andresx7@gmail.com, alexdeucher@gmail.com, christian.koenig@amd.com, kvalo@codeaurora.org MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use the correct prefix for symbols exported by firmware_loader(). This is done since firmware_sysfs_fallback() is now exposed through kernel-doc. Signed-off-by: Andres Rodriguez --- drivers/base/firmware_loader/fallback.c | 8 ++++---- drivers/base/firmware_loader/fallback.h | 4 ++-- drivers/base/firmware_loader/firmware.h | 6 +++--- drivers/base/firmware_loader/main.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 1a47ddc70c31..fc186b5bccce 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -661,10 +661,10 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_flags) return fw_force_sysfs_fallback(opt_flags); } -int fw_sysfs_fallback(struct firmware *fw, const char *name, - struct device *device, - enum fw_opt opt_flags, - int ret) +int firmware_sysfs_fallback(struct firmware *fw, const char *name, + struct device *device, + enum fw_opt opt_flags, + int ret) { if (!fw_run_sysfs_fallback(opt_flags)) return ret; diff --git a/drivers/base/firmware_loader/fallback.h b/drivers/base/firmware_loader/fallback.h index a3b73a09db6c..8cfaa3299bb7 100644 --- a/drivers/base/firmware_loader/fallback.h +++ b/drivers/base/firmware_loader/fallback.h @@ -31,7 +31,7 @@ struct firmware_fallback_config { }; #ifdef CONFIG_FW_LOADER_USER_HELPER -int fw_sysfs_fallback(struct firmware *fw, const char *name, +int firmware_sysfs_fallback(struct firmware *fw, const char *name, struct device *device, enum fw_opt opt_flags, int ret); @@ -43,7 +43,7 @@ void fw_fallback_set_default_timeout(void); int register_sysfs_loader(void); void unregister_sysfs_loader(void); #else /* CONFIG_FW_LOADER_USER_HELPER */ -static inline int fw_sysfs_fallback(struct firmware *fw, const char *name, +static inline int firmware_sysfs_fallback(struct firmware *fw, const char *name, struct device *device, enum fw_opt opt_flags, int ret) diff --git a/drivers/base/firmware_loader/firmware.h b/drivers/base/firmware_loader/firmware.h index a405d400a925..59836d50c5bd 100644 --- a/drivers/base/firmware_loader/firmware.h +++ b/drivers/base/firmware_loader/firmware.h @@ -15,12 +15,12 @@ * enum fw_opt - options to control firmware loading behaviour * * @FW_OPT_UEVENT: Enables the fallback mechanism to send a kobject uevent - * when the firmware is not found. Userspace is in charge - * to load the firmware using the sysfs loading facility. + * when the firmware is not found. Userspace is in charge + * to load the firmware using the sysfs loading facility. * @FW_OPT_NOWAIT: Used to describe the firmware request is asynchronous. * @FW_OPT_USERHELPER: Enable the fallback mechanism, in case the direct * filesystem lookup fails at finding the firmware. - * For details refer to fw_sysfs_fallback(). + * For details refer to firmware_sysfs_fallback(). * @FW_OPT_NO_WARN: Quiet, avoid printing warning messages. * @FW_OPT_NOCACHE: Disables firmware caching. Firmware caching is used to * cache the firmware upon suspend, so that upon resume diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index 58aaadf81e12..f009566acd35 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -581,7 +581,7 @@ _firmware_request(const struct firmware **firmware_p, const char *name, dev_warn(device, "Direct firmware load for %s failed with error %d\n", name, ret); - ret = fw_sysfs_fallback(fw, name, device, opt_flags, ret); + ret = firmware_sysfs_fallback(fw, name, device, opt_flags, ret); } else ret = assign_fw(fw, device, opt_flags);