Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62ab4e9e authored by Mathieu Poirier's avatar Mathieu Poirier
Browse files

coresight: Fixing wrong #ifdef/#endif placement 

Fixing problem reported by:
        https://lkml.org/lkml/2015/1/6/86



The #ifdef/#endif is wrong and prevents the stub of function
of_get_coresight_platform_data() from being visible when
CONFIG_OF is not defined.

Moving CONFIG_OF condition out of CONFIG_CORESIGHT, making
them both independent.

Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c61c4b5dd2c6b5dbf0f7e299db1e8411ef590f5c)
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 60383740

include/linux/coresight.h

+5 −5
Original line number Diff line number Diff line
@@ -230,10 +230,6 @@ extern void coresight_disable(struct coresight_device *csdev); 
extern int coresight_is_bit_set(u32 val, int position, int value);

extern int coresight_timeout(void __iomem *addr, u32 offset,

			     int position, int value);

#ifdef CONFIG_OF

extern struct coresight_platform_data *of_get_coresight_platform_data(

				struct device *dev, struct device_node *node);

#endif

#else

static inline struct coresight_device *

coresight_register(struct coresight_desc *desc) { return NULL; }
@@ -245,10 +241,14 @@ static inline int coresight_is_bit_set(u32 val, int position, int value) 
					 { return 0; }

static inline int coresight_timeout(void __iomem *addr, u32 offset,

				     int position, int value) { return 1; }

#endif



#ifdef CONFIG_OF

extern struct coresight_platform_data *of_get_coresight_platform_data(

				struct device *dev, struct device_node *node);

#else

static inline struct coresight_platform_data *of_get_coresight_platform_data(

	struct device *dev, struct device_node *node) { return NULL; }

#endif

#endif



#endif