diff options
| author | Rob Herring <robh@kernel.org> | 2015-03-25 01:41:08 -0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-03-25 01:41:08 -0400 |
| commit | 8147e2e8f13d823307e1edf2add5a8df84180cca (patch) | |
| tree | 476eae8727d98c56027ca1036a8f61ff261c9c51 /drivers/video/fbdev | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | bfe446e37c4efd8ade454911e8f80414bcbfc10d (diff) | |
Merge tag 'of-graph-for-4.0' of git://git.pengutronix.de/git/pza/linux into for-next
Pull of-graph helpers from Philipp Zabel:
of: Add of-graph helpers to loop over endpoints and find ports by id
This series converts of_graph_get_next_endpoint to decrement the refcount of
the passed prev parameter. This allows to add a for_each_endpoint_of_node
helper macro to loop over all endpoints in a device tree node.
The of_graph_get_port_by_id function is added to retrieve a port by its known
port id (contained in the reg property) from the device tree.
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c index 42b87f95267c..8b6f6d5fdd68 100644 --- a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c +++ b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | |||
| @@ -164,20 +164,15 @@ static void __init omapdss_walk_device(struct device_node *node, bool root) | |||
| 164 | 164 | ||
| 165 | pn = of_graph_get_remote_port_parent(n); | 165 | pn = of_graph_get_remote_port_parent(n); |
| 166 | 166 | ||
| 167 | if (!pn) { | 167 | if (!pn) |
| 168 | of_node_put(n); | ||
| 169 | continue; | 168 | continue; |
| 170 | } | ||
| 171 | 169 | ||
| 172 | if (!of_device_is_available(pn) || omapdss_list_contains(pn)) { | 170 | if (!of_device_is_available(pn) || omapdss_list_contains(pn)) { |
| 173 | of_node_put(pn); | 171 | of_node_put(pn); |
| 174 | of_node_put(n); | ||
| 175 | continue; | 172 | continue; |
| 176 | } | 173 | } |
| 177 | 174 | ||
| 178 | omapdss_walk_device(pn, false); | 175 | omapdss_walk_device(pn, false); |
| 179 | |||
| 180 | of_node_put(n); | ||
| 181 | } | 176 | } |
| 182 | } | 177 | } |
| 183 | 178 | ||
