| Message ID | 1394204235-28706-1-git-send-email-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Freitag, den 07.03.2014, 15:57 +0100 schrieb Philipp Zabel: > This patch fixes the following build error: > > In file included from drivers/media/i2c/adv7343.c:29:0: > >> include/linux/of_graph.h:41:1: error: expected identifier or '(' before '{' token > { > ^ > include/linux/of_graph.h:39:19: warning: 'of_graph_parse_endpoint' declared 'static' but never defined [-Wunused-function] > static inline int of_graph_parse_endpoint(const struct device_node *node, > ^ > > vim +41 include/linux/of_graph.h > > 35 const struct device_node *node); > 36 struct device_node *of_graph_get_remote_port(const struct device_node *node); > 37 #else > 38 > 39 static inline int of_graph_parse_endpoint(const struct device_node *node, > 40 struct of_endpoint *endpoint); > > 41 { > 42 return -ENOSYS; > 43 } > 44 > > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > include/linux/of_graph.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h > index 17f28eb..46795b3 100644 > --- a/include/linux/of_graph.h > +++ b/include/linux/of_graph.h > @@ -45,7 +45,7 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node); > #else > > static inline int of_graph_parse_endpoint(const struct device_node *node, > - struct of_endpoint *endpoint); > + struct of_endpoint *endpoint) > { > return -ENOSYS; > } I have also updated the git branch. The following changes since commit d484700a36952c6675aa47dec4d7a536929aa922: of: Warn if of_graph_parse_endpoint is called with the root node (2014-03-06 17:41:54 +0100) are available in the git repository at: git://git.pengutronix.de/git/pza/linux.git topic/of-graph for you to fetch changes up to 00fd9619120db1d6a19be2f9e3df6f76234b311b: of: Fix of_graph_parse_endpoint stub for !CONFIG_OF builds (2014-03-07 16:02:46 +0100) ---------------------------------------------------------------- Philipp Zabel (1): of: Fix of_graph_parse_endpoint stub for !CONFIG_OF builds include/linux/of_graph.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) regards Philipp -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 07, 2014 at 04:06:10PM +0100, Philipp Zabel wrote: > I have also updated the git branch. The following changes since commit > d484700a36952c6675aa47dec4d7a536929aa922: > > of: Warn if of_graph_parse_endpoint is called with the root node > (2014-03-06 17:41:54 +0100) > > are available in the git repository at: > > git://git.pengutronix.de/git/pza/linux.git topic/of-graph > > for you to fetch changes up to 00fd9619120db1d6a19be2f9e3df6f76234b311b: > > of: Fix of_graph_parse_endpoint stub for !CONFIG_OF builds (2014-03-07 > 16:02:46 +0100) Thanks, I'll re-pull it shortly. The other good news is that I've thrown your patches on top of the previous pull, merged them into my test tree and everything seems to work as it should on the SolidRun Hummingboard. What base have you used for those imx-drm patches? I assume it would be something like a merge of my imx-drm commits and the of-graph branch? Let me put this a different way: I'd be happy to pull those changes if they're sensibly based in your git tree. Thanks.
Hi Russell, Am Freitag, den 07.03.2014, 15:49 +0000 schrieb Russell King - ARM Linux: > On Fri, Mar 07, 2014 at 04:06:10PM +0100, Philipp Zabel wrote: > > I have also updated the git branch. The following changes since commit > > d484700a36952c6675aa47dec4d7a536929aa922: > > > > of: Warn if of_graph_parse_endpoint is called with the root node > > (2014-03-06 17:41:54 +0100) > > > > are available in the git repository at: > > > > git://git.pengutronix.de/git/pza/linux.git topic/of-graph > > > > for you to fetch changes up to 00fd9619120db1d6a19be2f9e3df6f76234b311b: > > > > of: Fix of_graph_parse_endpoint stub for !CONFIG_OF builds (2014-03-07 > > 16:02:46 +0100) > > Thanks, I'll re-pull it shortly. The other good news is that I've thrown > your patches on top of the previous pull, merged them into my test tree > and everything seems to work as it should on the SolidRun Hummingboard. > > What base have you used for those imx-drm patches? I assume it would > be something like a merge of my imx-drm commits and the of-graph branch? I have based the topic/imx-drm-dt branch on the staging-next branch of the staging tree, at the time it was created: 17b02809cfa77abcab155ce3afbb1467e7f0744f "Merge 3.14-rc5 into staging-next" The topic/imx-drm-dt branch is not based on topic/of-graph at all. > Let me put this a different way: I'd be happy to pull those changes if > they're sensibly based in your git tree. Thanks! regards Philipp -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h index 17f28eb..46795b3 100644 --- a/include/linux/of_graph.h +++ b/include/linux/of_graph.h @@ -45,7 +45,7 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node); #else static inline int of_graph_parse_endpoint(const struct device_node *node, - struct of_endpoint *endpoint); + struct of_endpoint *endpoint) { return -ENOSYS; }