firmware loader: fix compile warning when CONFIG_PM=n
This patch replaces the previous macro of CONFIG_PM with CONFIG_PM_SLEEP becasue firmware cache is only used in system sleep situations. Also this patch fixes the below compile warning when CONFIG_PM=n: drivers/base/firmware_class.c:1147: warning: 'device_cache_fw_images' defined but not used drivers/base/firmware_class.c:1212: warning: 'device_uncache_fw_images_delay' defined but not used Reported-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
ef4158c563
Коммит
cfe016b14e
|
@ -96,7 +96,9 @@ struct firmware_cache {
|
|||
/* firmware_buf instance will be added into the below list */
|
||||
spinlock_t lock;
|
||||
struct list_head head;
|
||||
int state;
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
/*
|
||||
* Names of firmware images which have been cached successfully
|
||||
* will be added into the below list so that device uncache
|
||||
|
@ -106,13 +108,12 @@ struct firmware_cache {
|
|||
spinlock_t name_lock;
|
||||
struct list_head fw_names;
|
||||
|
||||
int state;
|
||||
|
||||
wait_queue_head_t wait_queue;
|
||||
int cnt;
|
||||
struct delayed_work work;
|
||||
|
||||
struct notifier_block pm_notify;
|
||||
#endif
|
||||
};
|
||||
|
||||
struct firmware_buf {
|
||||
|
@ -622,6 +623,7 @@ static void fw_set_page_data(struct firmware_buf *buf, struct firmware *fw)
|
|||
(unsigned int)buf->size);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static void fw_name_devm_release(struct device *dev, void *res)
|
||||
{
|
||||
struct fw_name_devm *fwn = res;
|
||||
|
@ -670,6 +672,12 @@ static int fw_add_devm_name(struct device *dev, const char *name)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
static int fw_add_devm_name(struct device *dev, const char *name)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void _request_firmware_cleanup(const struct firmware **firmware_p)
|
||||
{
|
||||
|
@ -1046,6 +1054,7 @@ int uncache_firmware(const char *fw_name)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static struct fw_cache_entry *alloc_fw_cache_entry(const char *name)
|
||||
{
|
||||
struct fw_cache_entry *fce;
|
||||
|
@ -1258,7 +1267,6 @@ static void device_uncache_fw_images_delay(unsigned long delay)
|
|||
msecs_to_jiffies(delay));
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int fw_pm_notify(struct notifier_block *notify_block,
|
||||
unsigned long mode, void *unused)
|
||||
{
|
||||
|
@ -1285,13 +1293,6 @@ static int fw_pm_notify(struct notifier_block *notify_block,
|
|||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
static int fw_pm_notify(struct notifier_block *notify_block,
|
||||
unsigned long mode, void *unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* stop caching firmware once syscore_suspend is reached */
|
||||
static int fw_suspend(void)
|
||||
|
@ -1303,16 +1304,23 @@ static int fw_suspend(void)
|
|||
static struct syscore_ops fw_syscore_ops = {
|
||||
.suspend = fw_suspend,
|
||||
};
|
||||
#else
|
||||
static int fw_cache_piggyback_on_request(const char *name)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void __init fw_cache_init(void)
|
||||
{
|
||||
spin_lock_init(&fw_cache.lock);
|
||||
INIT_LIST_HEAD(&fw_cache.head);
|
||||
fw_cache.state = FW_LOADER_NO_CACHE;
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
spin_lock_init(&fw_cache.name_lock);
|
||||
INIT_LIST_HEAD(&fw_cache.fw_names);
|
||||
fw_cache.cnt = 0;
|
||||
fw_cache.state = FW_LOADER_NO_CACHE;
|
||||
|
||||
init_waitqueue_head(&fw_cache.wait_queue);
|
||||
INIT_DELAYED_WORK(&fw_cache.work,
|
||||
|
@ -1322,6 +1330,7 @@ static void __init fw_cache_init(void)
|
|||
register_pm_notifier(&fw_cache.pm_notify);
|
||||
|
||||
register_syscore_ops(&fw_syscore_ops);
|
||||
#endif
|
||||
}
|
||||
|
||||
static int __init firmware_class_init(void)
|
||||
|
@ -1332,8 +1341,10 @@ static int __init firmware_class_init(void)
|
|||
|
||||
static void __exit firmware_class_exit(void)
|
||||
{
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
unregister_syscore_ops(&fw_syscore_ops);
|
||||
unregister_pm_notifier(&fw_cache.pm_notify);
|
||||
#endif
|
||||
class_unregister(&firmware_class);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче