diff options
author | Mathieu Poirier <mathieu.poirier@linaro.org> | 2015-01-09 18:57:20 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-12 08:04:13 -0500 |
commit | c61c4b5dd2c6b5dbf0f7e299db1e8411ef590f5c (patch) | |
tree | 094b8b118cccc1bcc8f4074a8d348fa3fd887fc0 /include/linux/coresight.h | |
parent | ff1e33b0c16ba422e3bf3fa8cc7e89b2c958e193 (diff) |
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: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/coresight.h')
-rw-r--r-- | include/linux/coresight.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 7cbfecbfa643..cd6d4c384ca3 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h | |||
@@ -230,10 +230,6 @@ extern void coresight_disable(struct coresight_device *csdev); | |||
230 | extern int coresight_is_bit_set(u32 val, int position, int value); | 230 | extern int coresight_is_bit_set(u32 val, int position, int value); |
231 | extern int coresight_timeout(void __iomem *addr, u32 offset, | 231 | extern int coresight_timeout(void __iomem *addr, u32 offset, |
232 | int position, int value); | 232 | int position, int value); |
233 | #ifdef CONFIG_OF | ||
234 | extern struct coresight_platform_data *of_get_coresight_platform_data( | ||
235 | struct device *dev, struct device_node *node); | ||
236 | #endif | ||
237 | #else | 233 | #else |
238 | static inline struct coresight_device * | 234 | static inline struct coresight_device * |
239 | coresight_register(struct coresight_desc *desc) { return NULL; } | 235 | 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) | |||
245 | { return 0; } | 241 | { return 0; } |
246 | static inline int coresight_timeout(void __iomem *addr, u32 offset, | 242 | static inline int coresight_timeout(void __iomem *addr, u32 offset, |
247 | int position, int value) { return 1; } | 243 | int position, int value) { return 1; } |
244 | #endif | ||
245 | |||
248 | #ifdef CONFIG_OF | 246 | #ifdef CONFIG_OF |
247 | extern struct coresight_platform_data *of_get_coresight_platform_data( | ||
248 | struct device *dev, struct device_node *node); | ||
249 | #else | ||
249 | static inline struct coresight_platform_data *of_get_coresight_platform_data( | 250 | static inline struct coresight_platform_data *of_get_coresight_platform_data( |
250 | struct device *dev, struct device_node *node) { return NULL; } | 251 | struct device *dev, struct device_node *node) { return NULL; } |
251 | #endif | 252 | #endif |
252 | #endif | ||
253 | 253 | ||
254 | #endif | 254 | #endif |