diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
| commit | a2166ca5f3204794e8b59f01c93a0f1564e3e138 (patch) | |
| tree | b667828c308ffd79f1b2bd8fc1da95e43dfef4e3 /drivers/gpu/drm/imx/imx-drm-core.c | |
| parent | 37791b6fbe7ab772020e714d34515f144fa981a0 (diff) | |
| parent | 01218bf14ee60d4a2d6c667ebdbba3ae9a7a1d66 (diff) | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Conflicts:
drivers/of/unittest.c
Diffstat (limited to 'drivers/gpu/drm/imx/imx-drm-core.c')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-drm-core.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index a002f53aab0e..84cf99f8d957 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -431,15 +431,6 @@ int imx_drm_encoder_parse_of(struct drm_device *drm, } EXPORT_SYMBOL_GPL(imx_drm_encoder_parse_of); -static struct device_node *imx_drm_of_get_next_endpoint( - const struct device_node *parent, struct device_node *prev) -{ - struct device_node *node = of_graph_get_next_endpoint(parent, prev); - - of_node_put(prev); - return node; -} - /* * @node: device tree node containing encoder input ports * @encoder: drm_encoder @@ -457,7 +448,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node, return -EINVAL; do { - ep = imx_drm_of_get_next_endpoint(node, ep); + ep = of_graph_get_next_endpoint(node, ep); if (!ep) break; |