From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: rjw@sisk.pl
Cc: g.liakhovetski@gmx.de, damm@opensource.se,
linux-next@vger.kernel.org,
Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH] pm_domain: delete duplicate stubs for dev_gpd_data
Date: Sat, 25 Feb 2012 12:51:49 -0500 [thread overview]
Message-ID: <1330192309-25935-1-git-send-email-paul.gortmaker@windriver.com> (raw)
Two recent commits independently added a stub for this function,
causing this build failure:
CC drivers/sh/pm_runtime.o
In file included from drivers/sh/pm_runtime.c:15:0:
include/linux/pm_domain.h:216:46: error: redefinition of 'dev_gpd_data'
include/linux/pm_domain.h:158:46: note: previous definition of 'dev_gpd_data' was here
Keep the one using ERR_PTR() and delete the other.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[linux-next commits are d57694ca59c0b310a162984a7a6a4efce8ddf815
and 9b4f617b1c2004332113b4a2c89dfb6e8029c987 that cause duplicate]
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 47bb082..5c2bbc2 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -213,10 +213,6 @@ static inline bool default_stop_ok(struct device *dev)
}
#define simple_qos_governor NULL
#define pm_domain_always_on_gov NULL
-static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev)
-{
- return NULL;
-}
#endif
static inline int pm_genpd_remove_callbacks(struct device *dev)
--
1.7.9.1
next reply other threads:[~2012-02-25 17:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-25 17:51 Paul Gortmaker [this message]
2012-02-25 21:47 ` [PATCH] pm_domain: delete duplicate stubs for dev_gpd_data Rafael J. Wysocki
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=1330192309-25935-1-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=damm@opensource.se \
--cc=g.liakhovetski@gmx.de \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
/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).