From: Ming Lei <ming.lei@canonical.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
Borislav Petkov <borislav.petkov@amd.com>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Ming Lei <ming.lei@canonical.com>
Subject: [PATCH v1 3/3] firmware loader: fix build failure if FW_LOADER is m
Date: Fri, 17 Aug 2012 22:07:00 +0800 [thread overview]
Message-ID: <1345212420-1707-4-git-send-email-ming.lei@canonical.com> (raw)
In-Reply-To: <1345212420-1707-1-git-send-email-ming.lei@canonical.com>
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>
---
drivers/base/firmware_class.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4c8d8ef..ed0510a 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);
--
1.7.9.5
prev parent reply other threads:[~2012-08-17 14:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-17 14:06 [PATCH v1 0/3] firmware loader: fix build failure Ming Lei
2012-08-17 14:06 ` [PATCH v1 1/3] firmware loader: fix compile failure if !PM Ming Lei
2012-08-17 14:06 ` [PATCH v1 2/3] PM / Sleep: introduce dpm_for_each_dev Ming Lei
2012-08-17 22:02 ` Rafael J. Wysocki
2012-08-18 0:43 ` Ming Lei
2012-08-18 13:38 ` Rafael J. Wysocki
2012-08-18 14:52 ` Ming Lei
2012-08-18 20:33 ` Rafael J. Wysocki
2012-08-18 20:49 ` Rafael J. Wysocki
2012-08-19 6:20 ` Greg Kroah-Hartman
2012-08-19 20:10 ` Rafael J. Wysocki
2012-08-17 14:07 ` Ming Lei [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345212420-1707-4-git-send-email-ming.lei@canonical.com \
--to=ming.lei@canonical.com \
--cc=borislav.petkov@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).