AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-29 12:40:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

coresight: Fixing wrong #ifdef/#endif placement

Browse Source 
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: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Poirier 2015-01-09 16:57:20 -07:00 committed by Greg Kroah-Hartman
parent ff1e33b0c1
commit c61c4b5dd2
1 changed files with 5 additions and 5 deletions

10
include/linux/coresight.h
View File

@ -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_is_bit_set(u32 val, int position, int value);
extern int coresight_timeout(void __iomem *addr, u32 offset, extern int coresight_timeout(void __iomem *addr, u32 offset,
int position, int value); 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 #else
static inline struct coresight_device * static inline struct coresight_device *
coresight_register(struct coresight_desc *desc) { return NULL; } 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; } { return 0; }
static inline int coresight_timeout(void __iomem *addr, u32 offset, static inline int coresight_timeout(void __iomem *addr, u32 offset,
int position, int value) { return 1; } int position, int value) { return 1; }
#endif
#ifdef CONFIG_OF #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( static inline struct coresight_platform_data *of_get_coresight_platform_data(
struct device *dev, struct device_node *node) { return NULL; } struct device *dev, struct device_node *node) { return NULL; }
#endif #endif
#endif
#endif #endif