| Message ID | 1425433485-902-1-git-send-email-wenyou.yang@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/03/2015 at 09:44:45 +0800, Wenyou Yang wrote : > Since at91_pm_set_standby() will not be used out of the pm.c file, > change its attribute from extern to static, remove its declaration as well. > > void at91_pm_set_standby(void (*at91_standby)(void)) > --> > static void at91_pm_set_standby(void (*at91_standby)(void)) > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > arch/arm/mach-at91/pm.c | 2 +- > arch/arm/mach-at91/pm.h | 6 ------ > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c > index aa4116e..a4473dc 100644 > --- a/arch/arm/mach-at91/pm.c > +++ b/arch/arm/mach-at91/pm.c > @@ -218,7 +218,7 @@ static struct platform_device at91_cpuidle_device = { > .name = "cpuidle-at91", > }; > > -void at91_pm_set_standby(void (*at91_standby)(void)) > +static void at91_pm_set_standby(void (*at91_standby)(void)) > { > if (at91_standby) { > at91_cpuidle_device.dev.platform_data = at91_standby; > diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h > index 86c0aa8..86a9d0b 100644 > --- a/arch/arm/mach-at91/pm.h > +++ b/arch/arm/mach-at91/pm.h > @@ -15,12 +15,6 @@ > > #include <mach/at91_ramc.h> > > -#ifdef CONFIG_PM > -extern void at91_pm_set_standby(void (*at91_standby)(void)); > -#else > -static inline void at91_pm_set_standby(void (*at91_standby)(void)) { } > -#endif > - > /* > * The AT91RM9200 goes into self-refresh mode with this command, and will > * terminate self-refresh automatically on the next SDRAM access. > -- > 1.7.9.5 >
Le 04/03/2015 02:44, Wenyou Yang a écrit : > Since at91_pm_set_standby() will not be used out of the pm.c file, > change its attribute from extern to static, remove its declaration as well. > > void at91_pm_set_standby(void (*at91_standby)(void)) > --> > static void at91_pm_set_standby(void (*at91_standby)(void)) These 3 lines are not needed ^^^^ > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Thanks, I add this to the at91-4.1-cleanup branch. Bye, > --- > arch/arm/mach-at91/pm.c | 2 +- > arch/arm/mach-at91/pm.h | 6 ------ > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c > index aa4116e..a4473dc 100644 > --- a/arch/arm/mach-at91/pm.c > +++ b/arch/arm/mach-at91/pm.c > @@ -218,7 +218,7 @@ static struct platform_device at91_cpuidle_device = { > .name = "cpuidle-at91", > }; > > -void at91_pm_set_standby(void (*at91_standby)(void)) > +static void at91_pm_set_standby(void (*at91_standby)(void)) > { > if (at91_standby) { > at91_cpuidle_device.dev.platform_data = at91_standby; > diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h > index 86c0aa8..86a9d0b 100644 > --- a/arch/arm/mach-at91/pm.h > +++ b/arch/arm/mach-at91/pm.h > @@ -15,12 +15,6 @@ > > #include <mach/at91_ramc.h> > > -#ifdef CONFIG_PM > -extern void at91_pm_set_standby(void (*at91_standby)(void)); > -#else > -static inline void at91_pm_set_standby(void (*at91_standby)(void)) { } > -#endif > - > /* > * The AT91RM9200 goes into self-refresh mode with this command, and will > * terminate self-refresh automatically on the next SDRAM access. >
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index aa4116e..a4473dc 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -218,7 +218,7 @@ static struct platform_device at91_cpuidle_device = { .name = "cpuidle-at91", }; -void at91_pm_set_standby(void (*at91_standby)(void)) +static void at91_pm_set_standby(void (*at91_standby)(void)) { if (at91_standby) { at91_cpuidle_device.dev.platform_data = at91_standby; diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index 86c0aa8..86a9d0b 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h @@ -15,12 +15,6 @@ #include <mach/at91_ramc.h> -#ifdef CONFIG_PM -extern void at91_pm_set_standby(void (*at91_standby)(void)); -#else -static inline void at91_pm_set_standby(void (*at91_standby)(void)) { } -#endif - /* * The AT91RM9200 goes into self-refresh mode with this command, and will * terminate self-refresh automatically on the next SDRAM access.
Since at91_pm_set_standby() will not be used out of the pm.c file, change its attribute from extern to static, remove its declaration as well. void at91_pm_set_standby(void (*at91_standby)(void)) --> static void at91_pm_set_standby(void (*at91_standby)(void)) Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> --- arch/arm/mach-at91/pm.c | 2 +- arch/arm/mach-at91/pm.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-)