From: Qais Yousef <qais.yousef@imgtec.com>
To: <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <robh+dt@kernel.org>, <frowand.list@gmail.com>,
<grant.likely@linaro.org>, <jogo@openwrt.org>,
Qais Yousef <qais.yousef@imgtec.com>
Subject: [PATCH] Revert "of/irq: make of_irq_find_parent static"
Date: Wed, 2 Dec 2015 16:14:47 +0000 [thread overview]
Message-ID: <1449072887-2734-1-git-send-email-qais.yousef@imgtec.com> (raw)
This reverts commit 52493d446141b07c8ba28dd6a529513f8b2342bd.
Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
Conflicts:
include/linux/of_irq.h
---
I have a patch series that is under review that makes use of of_irq_find_parent()
The affected patch is this:
https://lkml.org/lkml/2015/11/25/291
Is it wrong to use this function? If yes, what's the alternative?
If no, OK to revert?
Thanks,
Qais
drivers/of/irq.c | 2 +-
include/linux/of_irq.h | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 902b89be7217..45735d56e435 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map);
* Returns a pointer to the interrupt parent node, or NULL if the interrupt
* parent could not be determined.
*/
-static struct device_node *of_irq_find_parent(struct device_node *child)
+struct device_node *of_irq_find_parent(struct device_node *child)
{
struct device_node *p;
const __be32 *parp;
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index 039f2eec49ce..0c9ea9fb5b63 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -93,6 +93,7 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np)
* so declare it here regardless of the CONFIG_OF_IRQ setting.
*/
extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
+extern struct device_node *of_irq_find_parent(struct device_node *child);
u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);
#else /* !CONFIG_OF && !CONFIG_SPARC */
@@ -102,6 +103,11 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
return 0;
}
+static inline void *of_irq_find_parent(struct device_node *child)
+{
+ return NULL;
+}
+
static inline u32 of_msi_map_rid(struct device *dev,
struct device_node *msi_np, u32 rid_in)
{
--
2.1.0
next reply other threads:[~2015-12-02 16:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 16:14 Qais Yousef [this message]
2015-12-02 16:32 ` Jonas Gorski
2015-12-02 17:10 ` Rob Herring
2015-12-03 9:40 ` Qais Yousef
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=1449072887-2734-1-git-send-email-qais.yousef@imgtec.com \
--to=qais.yousef@imgtec.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=grant.likely@linaro.org \
--cc=jogo@openwrt.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.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
all inboxes | Powered by JetHome®