This patch fixes the below build error reported by Stephen,

     Stephen reported:
     After merging the drm-exynos tree, today's linux-next build (x86_64
     allmodconfig) failed like this:

     drivers/media/i2c/adv7604.o: In function `of_graph_get_endpoint_by_regs':
     adv7604.c:(.text+0x586c): multiple definition of 
`of_graph_get_endpoint_by_regs'
     drivers/media/i2c/adv7343.o:adv7343.c:(.text+0xa13): first defined here
     drivers/media/platform/soc_camera/atmel-isi.o: In function 
`of_graph_get_endpoint_by_regs':
     atmel-isi.c:(.text+0x1ec9): multiple definition of 
`of_graph_get_endpoint_by_regs'
     
drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): 
first defined here
     drivers/media/platform/soc_camera/rcar_vin.o: In function 
`of_graph_get_endpoint_by_regs':
     rcar_vin.c:(.text+0x307c): multiple definition of 
`of_graph_get_endpoint_by_regs'
     
drivers/media/platform/soc_camera/soc_camera.o:soc_camera.c:(.text+0x2ce3): 
first defined here

     Caused by commit:
       a0f7001c18ca ("of: add helper for getting endpoint node of specific 
identifiers")

To fix the error, this patch declares of_graph_get_endpoint_by_regs function
with "static inline".

Signed-off-by: Inki Dae <inki.dae at samsung.com>
---
 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 1c1d5b9..f8bcd0e 100644
--- a/include/linux/of_graph.h
+++ b/include/linux/of_graph.h
@@ -71,7 +71,7 @@ static inline struct device_node *of_graph_get_next_endpoint(
        return NULL;
 }

-struct device_node *of_graph_get_endpoint_by_regs(
+static inline struct device_node *of_graph_get_endpoint_by_regs(
                const struct device_node *parent, int port_reg, int reg)
 {
        return NULL;
-- 
1.7.9.5

Reply via email to