From baa05587d0dff779f671d96f4025bfdd99d5ac02 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 26 Jan 2011 20:48:33 +0000 Subject: [PATCH] ramips: remove extern and __init from function prototypes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25123 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../arch/mips/include/asm/mach-ralink/common.h | 13 ++++++------- .../mips/include/asm/mach-ralink/dev-gpio-buttons.h | 10 +++++----- .../mips/include/asm/mach-ralink/dev-gpio-leds.h | 6 +++--- .../arch/mips/include/asm/mach-ralink/rt288x.h | 6 +++--- .../arch/mips/include/asm/mach-ralink/rt305x.h | 6 +++--- .../ramips/files/arch/mips/ralink/rt288x/devices.h | 9 ++++----- .../ramips/files/arch/mips/ralink/rt305x/devices.h | 9 ++++----- 7 files changed, 28 insertions(+), 31 deletions(-) diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h index 4fd732432c..8f058c88c4 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Gabor Juhos + * Copyright (C) 2009-2011 Gabor Juhos * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -12,13 +12,12 @@ #define RAMIPS_SYS_TYPE_LEN 64 extern unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN]; -void __init ramips_intc_irq_init(unsigned intc_base, unsigned irq, - unsigned irq_base); +void ramips_intc_irq_init(unsigned intc_base, unsigned irq, unsigned irq_base); u32 ramips_intc_get_status(void); -void __init ramips_soc_setup(void); -void __init ramips_gpio_init(void); -void __init ramips_early_serial_setup(int line, unsigned base, unsigned freq, - unsigned irq); +void ramips_soc_setup(void); +void ramips_gpio_init(void); +void ramips_early_serial_setup(int line, unsigned base, unsigned freq, + unsigned irq); #endif /* __ASM_MACH_RALINK_COMMON_H */ diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-buttons.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-buttons.h index 0ab5c37626..d223737e09 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-buttons.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-buttons.h @@ -1,7 +1,7 @@ /* * Ralink SoC GPIO button support * - * Copyright (C) 2010 Gabor Juhos + * Copyright (C) 2010-2011 Gabor Juhos * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -15,10 +15,10 @@ #include #ifdef CONFIG_RALINK_DEV_GPIO_BUTTONS -void __init ramips_register_gpio_buttons(int id, - unsigned poll_interval, - unsigned nbuttons, - struct gpio_button *buttons); +void ramips_register_gpio_buttons(int id, + unsigned poll_interval, + unsigned nbuttons, + struct gpio_button *buttons); #else static inline void ramips_register_gpio_buttons(int id, unsigned poll_interval, diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-leds.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-leds.h index ad2ed2667b..24233abde6 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-leds.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/dev-gpio-leds.h @@ -1,7 +1,7 @@ /* * Ralink SoC GPIO LED device support * - * Copyright (C) 2009-2010 Gabor Juhos + * Copyright (C) 2009-2011 Gabor Juhos * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -14,8 +14,8 @@ #include #ifdef CONFIG_RALINK_DEV_GPIO_LEDS -__init void ramips_register_gpio_leds(int id, unsigned num_leds, - struct gpio_led *leds); +void ramips_register_gpio_leds(int id, unsigned num_leds, + struct gpio_led *leds); #else static inline void ramips_register_gpio_leds(int id, unsigned num_leds, struct gpio_led *leds) diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h index a804488f08..7dfc5e321a 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h @@ -17,8 +17,8 @@ #include #include -void rt288x_detect_sys_type(void) __init; -void rt288x_detect_sys_freq(void) __init; +void rt288x_detect_sys_type(void); +void rt288x_detect_sys_freq(void); extern unsigned long rt288x_cpu_freq; extern unsigned long rt288x_sys_freq; @@ -68,6 +68,6 @@ static inline u32 rt288x_memc_rr(unsigned reg) return __raw_readl(rt288x_memc_base + reg); } -void rt288x_gpio_init(u32 mode) __init; +void rt288x_gpio_init(u32 mode); #endif /* _RT228X_H_ */ diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h index 195bfbe51a..96ae26c3c8 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h @@ -16,8 +16,8 @@ #include #include -void rt305x_detect_sys_type(void) __init; -void rt305x_detect_sys_freq(void) __init; +void rt305x_detect_sys_type(void); +void rt305x_detect_sys_freq(void); extern unsigned long rt305x_cpu_freq; extern unsigned long rt305x_sys_freq; @@ -126,6 +126,6 @@ static inline u32 rt305x_memc_rr(unsigned reg) #define RT305X_GPIO_GE0_RXDV 50 #define RT305X_GPIO_GE0_RXCLK 51 -void rt305x_gpio_init(u32 mode) __init; +void rt305x_gpio_init(u32 mode); #endif /* _RT305X_H_ */ diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.h b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.h index 6bd2d3f90c..1ffbfb2a8a 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.h +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.h @@ -1,7 +1,7 @@ /* * Ralink RT288x SoC specific platform definitions * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2011 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -14,11 +14,10 @@ struct physmap_flash_data; -extern void rt288x_register_flash(unsigned int id, - struct physmap_flash_data *pdata) __init; -void rt288x_register_wifi(void) __init; +void rt288x_register_flash(unsigned int id, struct physmap_flash_data *pdata); +void rt288x_register_wifi(void); extern struct ramips_eth_platform_data rt288x_eth_data; -void rt288x_register_ethernet(void) __init; +void rt288x_register_ethernet(void); #endif /* __ASM_MACH_RT288X_PLATFORM_H */ diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.h b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.h index 6a267116b5..31ef4033f6 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.h +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.h @@ -1,7 +1,7 @@ /* * Ralink RT305x SoC specific platform device definitions * - * Copyright (C) 2009-2010 Gabor Juhos + * Copyright (C) 2009-2011 Gabor Juhos * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -17,10 +17,9 @@ struct physmap_flash_data; extern struct rt305x_esw_platform_data rt305x_esw_data; -extern void rt305x_register_flash(unsigned int id, - struct physmap_flash_data *pdata) __init; -extern void rt305x_register_ethernet(void) __init; -extern void rt305x_register_wifi(void) __init; +void rt305x_register_flash(unsigned int id, struct physmap_flash_data *pdata); +void rt305x_register_ethernet(void); +void rt305x_register_wifi(void); #endif /* __RT305X_DEVICES_H */