diff options
author | Thomas Abraham <thomas.abraham@linaro.org> | 2012-03-25 11:02:49 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-04-17 18:37:22 -0400 |
commit | 766644d2df254934d656a0a0628b636212c24f9e (patch) | |
tree | de96ad3f99802de7df67fa6203ce373a5d62e7bf /include/linux/of_irq.h | |
parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) |
of/irq: add empty irq_of_parse_and_map() for non-dt builds
Add a empty irq_of_parse_and_map() function that returns 0 for non-dt
builds and avoid having #ifdef CONFIG_OF around all calls to
irq_of_parse_and_map(). In addition to that, the irq_of_parse_and_map()
function declaration is made available only if CONFIG_OF_IRQ is defined,
which is the same config option that makes the irq_of_parse_and_map()
function definition available. While at it, fix a typo as well.
Changes since v1:
- Moved irq_of_parse_and_map() function declaration under CONFIG_OF_IRQ.
- Fix a minor typo in comments.
Suggested-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
[grant.likely: fix bug causing SPARC to break]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'include/linux/of_irq.h')
-rw-r--r-- | include/linux/of_irq.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index d229ad3edee..1717cd935e1 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h | |||
@@ -11,7 +11,7 @@ struct of_irq; | |||
11 | #include <linux/of.h> | 11 | #include <linux/of.h> |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * irq_of_parse_and_map() is used ba all OF enabled platforms; but SPARC | 14 | * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC |
15 | * implements it differently. However, the prototype is the same for all, | 15 | * implements it differently. However, the prototype is the same for all, |
16 | * so declare it here regardless of the CONFIG_OF_IRQ setting. | 16 | * so declare it here regardless of the CONFIG_OF_IRQ setting. |
17 | */ | 17 | */ |
@@ -76,5 +76,13 @@ extern struct device_node *of_irq_find_parent(struct device_node *child); | |||
76 | extern void of_irq_init(const struct of_device_id *matches); | 76 | extern void of_irq_init(const struct of_device_id *matches); |
77 | 77 | ||
78 | #endif /* CONFIG_OF_IRQ */ | 78 | #endif /* CONFIG_OF_IRQ */ |
79 | #endif /* CONFIG_OF */ | 79 | |
80 | #else /* !CONFIG_OF */ | ||
81 | static inline unsigned int irq_of_parse_and_map(struct device_node *dev, | ||
82 | int index) | ||
83 | { | ||
84 | return 0; | ||
85 | } | ||
86 | #endif /* !CONFIG_OF */ | ||
87 | |||
80 | #endif /* __OF_IRQ_H */ | 88 | #endif /* __OF_IRQ_H */ |