diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-08 16:09:24 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-20 14:25:24 -0500 |
| commit | 54196ccbe0ba1f268a646059473313589db35b01 (patch) | |
| tree | 07443c68af484b0a74ce8456e58f97342f95cf25 /drivers | |
| parent | 826d8958419ae924ae2af12d214ee599ee713e91 (diff) | |
| download | linux-54196ccbe0ba1f268a646059473313589db35b01.tar.gz linux-54196ccbe0ba1f268a646059473313589db35b01.tar.bz2 linux-54196ccbe0ba1f268a646059473313589db35b01.zip | |
of: consolidate linker section OF match table declarations
We now have several OF match tables using linker sections that are
nearly the same definition. The only variation is the callback function
prototype. Create a common define for creating linker section OF match
table entries which each table declaration can use.
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/clksrc-of.c | 2 | ||||
| -rw-r--r-- | drivers/irqchip/irqchip.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c index ae2e4278c42a..0093a8e49e14 100644 --- a/drivers/clocksource/clksrc-of.c +++ b/drivers/clocksource/clksrc-of.c @@ -27,7 +27,7 @@ void __init clocksource_of_init(void) { struct device_node *np; const struct of_device_id *match; - clocksource_of_init_fn init_func; + of_init_fn_1 init_func; unsigned clocksources = 0; for_each_matching_node_and_match(np, __clksrc_of_table, &match) { diff --git a/drivers/irqchip/irqchip.h b/drivers/irqchip/irqchip.h index e445ba2d6add..0f6486d4f1b0 100644 --- a/drivers/irqchip/irqchip.h +++ b/drivers/irqchip/irqchip.h @@ -11,6 +11,8 @@ #ifndef _IRQCHIP_H #define _IRQCHIP_H +#include <linux/of.h> + /* * This macro must be used by the different irqchip drivers to declare * the association between their DT compatible string and their @@ -21,9 +23,6 @@ * @compstr: compatible string of the irqchip driver * @fn: initialization function */ -#define IRQCHIP_DECLARE(name,compstr,fn) \ - static const struct of_device_id irqchip_of_match_##name \ - __used __section(__irqchip_of_table) \ - = { .compatible = compstr, .data = fn } +#define IRQCHIP_DECLARE(name, compat, fn) OF_DECLARE_2(irqchip, name, compat, fn) #endif |