Re: [PATCH 6/7] x86: remove unneeded prototypes

[Cyrill Gorcunov <gorcunov@gmail.com>]

On 03/03/2011 11:05 PM, Henrik Kretzschmar wrote:
> lapic_clockevent is moved, that we can get rid of some
> unneeded prototypes.
> 
> Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
> ---
>  arch/x86/kernel/apic/apic.c |   38 +++++++++++++++++---------------------
>  1 files changed, 17 insertions(+), 21 deletions(-)
> 
> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
> index a0e9c1f..64efb2d 100644
> --- a/arch/x86/kernel/apic/apic.c
> +++ b/arch/x86/kernel/apic/apic.c
> @@ -187,29 +187,8 @@ static struct resource lapic_resource = {
>  
>  static unsigned int calibration_result;
>  
> -static int lapic_next_event(unsigned long delta,
> -			    struct clock_event_device *evt);
> -static void lapic_timer_setup(enum clock_event_mode mode,
> -			      struct clock_event_device *evt);
> -static void lapic_timer_broadcast(const struct cpumask *mask);
>  static void apic_pm_activate(void);
>  
> -/*
> - * The local apic timer can be used for any function which is CPU local.
> - */
> -static struct clock_event_device lapic_clockevent = {
> -	.name		= "lapic",
> -	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT
> -			| CLOCK_EVT_FEAT_C3STOP | CLOCK_EVT_FEAT_DUMMY,
> -	.shift		= 32,
> -	.set_mode	= lapic_timer_setup,
> -	.set_next_event	= lapic_next_event,
> -	.broadcast	= lapic_timer_broadcast,
> -	.rating		= 100,
> -	.irq		= -1,
> -};
> -static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
> -
>  static unsigned long apic_phys;
>  
>  /*
> @@ -501,6 +480,23 @@ static void lapic_timer_broadcast(const struct cpumask *mask)
>  #endif
>  }
>  
> +
> +/*
> + * The local apic timer can be used for any function which is CPU local.
> + */
> +static struct clock_event_device lapic_clockevent = {
> +	.name		= "lapic",
> +	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT
> +			| CLOCK_EVT_FEAT_C3STOP | CLOCK_EVT_FEAT_DUMMY,
> +	.shift		= 32,
> +	.set_mode	= lapic_timer_setup,
> +	.set_next_event	= lapic_next_event,
> +	.broadcast	= lapic_timer_broadcast,
> +	.rating		= 100,
> +	.irq		= -1,
> +};
> +static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
> +
>  /*
>   * Setup the local APIC timer for this CPU. Copy the initialized values
>   * of the boot CPU and register the clock event in the framework.

Looks good to me  -- now this snippets are near the place we refer them.

-- 
    Cyrill