Skip to content

Commit

Permalink
firmware loader: fix build failure if FW_LOADER is m
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ming Lei authored and Greg Kroah-Hartman committed Aug 17, 2012
1 parent dfe3212 commit ab6dd8e
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/base/firmware_class.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand All @@ -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);
Expand Down

0 comments on commit ab6dd8e

Please sign in to comment.