diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-19 15:38:50 +0100 | 
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-19 22:57:40 +0100 | 
| commit | 4d10f054f7df600ec8a388091c93b2d976920de0 (patch) | |
| tree | 0b76d66daa1006ca9af5ec060bfd3b4c026bafcd /drivers/clocksource/clksrc-of.c | |
| parent | da4a686a2cfb077a8bfc1697f597e7f86235b822 (diff) | |
| download | olio-linux-3.10-4d10f054f7df600ec8a388091c93b2d976920de0.tar.xz olio-linux-3.10-4d10f054f7df600ec8a388091c93b2d976920de0.zip  | |
clocksource: make CLOCKSOURCE_OF_DECLARE type safe
This ensures that a function pointer passed into CLOCKSOURCE_OF_DECLARE
takes the same arguments that we use for calling that function later.
Also fix the extraneous semicolon at end of the CLOCKSOURCE_OF_DECLARE
definition.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'drivers/clocksource/clksrc-of.c')
| -rw-r--r-- | drivers/clocksource/clksrc-of.c | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c index 3ef11fba781..37f5325bec9 100644 --- a/drivers/clocksource/clksrc-of.c +++ b/drivers/clocksource/clksrc-of.c @@ -16,6 +16,7 @@  #include <linux/init.h>  #include <linux/of.h> +#include <linux/clocksource.h>  extern struct of_device_id __clksrc_of_table[]; @@ -26,7 +27,7 @@ void __init clocksource_of_init(void)  {  	struct device_node *np;  	const struct of_device_id *match; -	void (*init_func)(struct device_node *); +	clocksource_of_init_fn init_func;  	for_each_matching_node_and_match(np, __clksrc_of_table, &match) {  		init_func = match->data;  |