aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Poirier <mathieu.poirier@linaro.org>2015-01-09 16:57:20 -0700
committerMathieu Poirier <mathieu.poirier@linaro.org>2015-03-02 11:26:50 -0700
commit57e38f1f254cdc166732009bbe4249f88aab39ce (patch)
tree0b796c7476a4ab842cf6f441094f810f10bdaeba
parent9a61f5e65a14d2f6e5201f3be5b30f7ddc1c3dbc (diff)
downloadlinux-linaro-stable-57e38f1f254cdc166732009bbe4249f88aab39ce.tar.gz
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> (cherry picked from commit c61c4b5dd2c6b5dbf0f7e299db1e8411ef590f5c) Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-rw-r--r--include/linux/coresight.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 01ed3281d37e..41bdccf1b4dd 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -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