firmware loader: fix build failure if FW_LOADER is m
device_cache_fw_images need to iterate devices in system, so this patch applies the introduced dpm_for_each_dev to avoid link failure if CONFIG_FW_LOADER is m. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
dfe3212e01
commit
ab6dd8e5ec
@@ -27,7 +27,6 @@
|
|||||||
#include <linux/suspend.h>
|
#include <linux/suspend.h>
|
||||||
|
|
||||||
#include "base.h"
|
#include "base.h"
|
||||||
#include "power/power.h"
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Manuel Estrada Sainz");
|
MODULE_AUTHOR("Manuel Estrada Sainz");
|
||||||
MODULE_DESCRIPTION("Multi purpose firmware loading support");
|
MODULE_DESCRIPTION("Multi purpose firmware loading support");
|
||||||
@@ -1093,7 +1092,7 @@ static int devm_name_match(struct device *dev, void *res,
|
|||||||
return (fwn->magic == (unsigned long)match_data);
|
return (fwn->magic == (unsigned long)match_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dev_cache_fw_image(struct device *dev)
|
static void dev_cache_fw_image(struct device *dev, void *data)
|
||||||
{
|
{
|
||||||
LIST_HEAD(todo);
|
LIST_HEAD(todo);
|
||||||
struct fw_cache_entry *fce;
|
struct fw_cache_entry *fce;
|
||||||
@@ -1148,7 +1147,6 @@ static void __device_uncache_fw_images(void)
|
|||||||
static void device_cache_fw_images(void)
|
static void device_cache_fw_images(void)
|
||||||
{
|
{
|
||||||
struct firmware_cache *fwc = &fw_cache;
|
struct firmware_cache *fwc = &fw_cache;
|
||||||
struct device *dev;
|
|
||||||
int old_timeout;
|
int old_timeout;
|
||||||
DEFINE_WAIT(wait);
|
DEFINE_WAIT(wait);
|
||||||
|
|
||||||
@@ -1165,10 +1163,7 @@ static void device_cache_fw_images(void)
|
|||||||
old_timeout = loading_timeout;
|
old_timeout = loading_timeout;
|
||||||
loading_timeout = 10;
|
loading_timeout = 10;
|
||||||
|
|
||||||
device_pm_lock();
|
dpm_for_each_dev(NULL, dev_cache_fw_image);
|
||||||
list_for_each_entry(dev, &dpm_list, power.entry)
|
|
||||||
dev_cache_fw_image(dev);
|
|
||||||
device_pm_unlock();
|
|
||||||
|
|
||||||
/* wait for completion of caching firmware for all devices */
|
/* wait for completion of caching firmware for all devices */
|
||||||
spin_lock(&fwc->name_lock);
|
spin_lock(&fwc->name_lock);
|
||||||
|
|||||||
Reference in New Issue
Block a user