From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmallon@gmail.com (Ryan Mallon) Date: Fri, 27 Apr 2012 07:11:07 +1000 Subject: [PATCH 04/17] ARM: ep93xx: use machine specific hook for late init In-Reply-To: <1335454725-13089-5-git-send-email-shawn.guo@linaro.org> References: <1335454725-13089-1-git-send-email-shawn.guo@linaro.org> <1335454725-13089-5-git-send-email-shawn.guo@linaro.org> Message-ID: <4F99B9EB.6060806@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 27/04/12 01:38, Shawn Guo wrote: > Cc: Hartley Sweeten > Cc: Ryan Mallon > Signed-off-by: Shawn Guo Why do we want this? It increases the size of the code and changes a static function to a non-static one that now requires ifdefery to handle the !CONFIG_CRUNCH case. I don't see the value in this patch? ~Ryan > --- > arch/arm/mach-ep93xx/adssphere.c | 1 + > arch/arm/mach-ep93xx/core.c | 5 +++++ > arch/arm/mach-ep93xx/crunch.c | 4 +--- > arch/arm/mach-ep93xx/gesbc9312.c | 1 + > arch/arm/mach-ep93xx/include/mach/platform.h | 7 +++++++ > arch/arm/mach-ep93xx/micro9.c | 4 ++++ > arch/arm/mach-ep93xx/simone.c | 1 + > arch/arm/mach-ep93xx/snappercl15.c | 1 + > arch/arm/mach-ep93xx/ts72xx.c | 1 + > arch/arm/mach-ep93xx/vision_ep9307.c | 1 + > 10 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c > index 2d45947..a472777 100644 > --- a/arch/arm/mach-ep93xx/adssphere.c > +++ b/arch/arm/mach-ep93xx/adssphere.c > @@ -41,5 +41,6 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = adssphere_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c > index 8d25895..365a90b 100644 > --- a/arch/arm/mach-ep93xx/core.c > +++ b/arch/arm/mach-ep93xx/core.c > @@ -904,3 +904,8 @@ void ep93xx_restart(char mode, const char *cmd) > while (1) > ; > } > + > +void __init ep93xx_init_late(void) > +{ > + crunch_init(); > +} > diff --git a/arch/arm/mach-ep93xx/crunch.c b/arch/arm/mach-ep93xx/crunch.c > index 74753e2..a4a2ab9 100644 > --- a/arch/arm/mach-ep93xx/crunch.c > +++ b/arch/arm/mach-ep93xx/crunch.c > @@ -79,12 +79,10 @@ static struct notifier_block crunch_notifier_block = { > .notifier_call = crunch_do, > }; > > -static int __init crunch_init(void) > +int __init crunch_init(void) > { > thread_register_notifier(&crunch_notifier_block); > elf_hwcap |= HWCAP_CRUNCH; > > return 0; > } > - > -late_initcall(crunch_init); > diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c > index fcdffbe..437c341 100644 > --- a/arch/arm/mach-ep93xx/gesbc9312.c > +++ b/arch/arm/mach-ep93xx/gesbc9312.c > @@ -41,5 +41,6 @@ MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = gesbc9312_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h > index 602bd87..1ecb040 100644 > --- a/arch/arm/mach-ep93xx/include/mach/platform.h > +++ b/arch/arm/mach-ep93xx/include/mach/platform.h > @@ -53,5 +53,12 @@ void ep93xx_init_devices(void); > extern struct sys_timer ep93xx_timer; > > void ep93xx_restart(char, const char *); > +void ep93xx_init_late(void); > + > +#ifdef CONFIG_CRUNCH > +int crunch_init(void); > +#else > +static inline int crunch_init(void) { return 0; } > +#endif > > #endif > diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c > index dc431c5..3d7cdab 100644 > --- a/arch/arm/mach-ep93xx/micro9.c > +++ b/arch/arm/mach-ep93xx/micro9.c > @@ -85,6 +85,7 @@ MACHINE_START(MICRO9, "Contec Micro9-High") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = micro9_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > #endif > @@ -98,6 +99,7 @@ MACHINE_START(MICRO9M, "Contec Micro9-Mid") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = micro9_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > #endif > @@ -111,6 +113,7 @@ MACHINE_START(MICRO9L, "Contec Micro9-Lite") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = micro9_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > #endif > @@ -124,6 +127,7 @@ MACHINE_START(MICRO9S, "Contec Micro9-Slim") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = micro9_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > #endif > diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c > index f40c298..33dc079 100644 > --- a/arch/arm/mach-ep93xx/simone.c > +++ b/arch/arm/mach-ep93xx/simone.c > @@ -86,5 +86,6 @@ MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = simone_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c > index 0c00852..eb28237 100644 > --- a/arch/arm/mach-ep93xx/snappercl15.c > +++ b/arch/arm/mach-ep93xx/snappercl15.c > @@ -183,5 +183,6 @@ MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = snappercl15_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c > index 5ea7909..d4ef339 100644 > --- a/arch/arm/mach-ep93xx/ts72xx.c > +++ b/arch/arm/mach-ep93xx/ts72xx.c > @@ -252,5 +252,6 @@ MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = ts72xx_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END > diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c > index ba156eb..2905a49 100644 > --- a/arch/arm/mach-ep93xx/vision_ep9307.c > +++ b/arch/arm/mach-ep93xx/vision_ep9307.c > @@ -367,5 +367,6 @@ MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307") > .handle_irq = vic_handle_irq, > .timer = &ep93xx_timer, > .init_machine = vision_init_machine, > + .init_late = ep93xx_init_late, > .restart = ep93xx_restart, > MACHINE_END