summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2012-08-17 22:07:00 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-17 07:37:35 -0700
commitab6dd8e5ecf8c1a38ee1b9b9dfa9ab129dc3e200 (patch)
tree2a2fd2175ccc3caf8d0bea7f6101e64765bdbe24
parentdfe3212e0196c01402154971841463d721dea915 (diff)
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>
-rw-r--r--drivers/base/firmware_class.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4c8d8efecdf4..ed0510a912c8 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -27,7 +27,6 @@
#include <linux/suspend.h>
#include "base.h"
-#include "power/power.h"
MODULE_AUTHOR("Manuel Estrada Sainz");
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);
}
-static void dev_cache_fw_image(struct device *dev)
+static void dev_cache_fw_image(struct device *dev, void *data)
{
LIST_HEAD(todo);
struct fw_cache_entry *fce;
@@ -1148,7 +1147,6 @@ static void __device_uncache_fw_images(void)
static void device_cache_fw_images(void)
{
struct firmware_cache *fwc = &fw_cache;
- struct device *dev;
int old_timeout;
DEFINE_WAIT(wait);
@@ -1165,10 +1163,7 @@ static void device_cache_fw_images(void)
old_timeout = loading_timeout;
loading_timeout = 10;
- device_pm_lock();
- list_for_each_entry(dev, &dpm_list, power.entry)
- dev_cache_fw_image(dev);
- device_pm_unlock();
+ dpm_for_each_dev(NULL, dev_cache_fw_image);
/* wait for completion of caching firmware for all devices */
spin_lock(&fwc->name_lock);