From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751751Ab3FEFnY (ORCPT ); Wed, 5 Jun 2013 01:43:24 -0400 Received: from mail-pb0-f53.google.com ([209.85.160.53]:45661 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586Ab3FEFnW (ORCPT ); Wed, 5 Jun 2013 01:43:22 -0400 From: Ming Lei To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Ming Lei Subject: [PATCH 1/3] firmware loader: don't export cache_firmware and uncache_firmware Date: Wed, 5 Jun 2013 13:42:47 +0800 Message-Id: <1370410969-15328-2-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370410969-15328-1-git-send-email-ming.lei@canonical.com> References: <1370410969-15328-1-git-send-email-ming.lei@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Looks no drivers have the explict requirement for the two, just don't export them anymore. Signed-off-by: Ming Lei --- drivers/base/firmware_class.c | 6 ++---- include/linux/firmware.h | 11 ----------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index c31fc29..34d47e3 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -1240,7 +1240,7 @@ EXPORT_SYMBOL(request_firmware_nowait); * Return !0 otherwise * */ -int cache_firmware(const char *fw_name) +static int cache_firmware(const char *fw_name) { int ret; const struct firmware *fw; @@ -1255,7 +1255,6 @@ int cache_firmware(const char *fw_name) return ret; } -EXPORT_SYMBOL_GPL(cache_firmware); /** * uncache_firmware - remove one cached firmware image @@ -1268,7 +1267,7 @@ EXPORT_SYMBOL_GPL(cache_firmware); * Return !0 otherwise * */ -int uncache_firmware(const char *fw_name) +static int uncache_firmware(const char *fw_name) { struct firmware_buf *buf; struct firmware fw; @@ -1286,7 +1285,6 @@ int uncache_firmware(const char *fw_name) return -EINVAL; } -EXPORT_SYMBOL_GPL(uncache_firmware); #ifdef CONFIG_PM_SLEEP static ASYNC_DOMAIN_EXCLUSIVE(fw_cache_domain); diff --git a/include/linux/firmware.h b/include/linux/firmware.h index e4279fe..e154c10 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -47,8 +47,6 @@ int request_firmware_nowait( void (*cont)(const struct firmware *fw, void *context)); void release_firmware(const struct firmware *fw); -int cache_firmware(const char *name); -int uncache_firmware(const char *name); #else static inline int request_firmware(const struct firmware **fw, const char *name, @@ -68,15 +66,6 @@ static inline void release_firmware(const struct firmware *fw) { } -static inline int cache_firmware(const char *name) -{ - return -ENOENT; -} - -static inline int uncache_firmware(const char *name) -{ - return -EINVAL; -} #endif #endif -- 1.7.9.5