[PATCH v2 05/19] powerpc/chrp/setup: Add attribute unused and make some functions static

[LEROY Christophe]

The subject of the patch should be updated as well

Christophe


Mathieu Malaterre <malat at debian.org> a écrit :

> Remove variable declaration idu_size and associated code since not used.
>
> These functions can all be static, make it so. Fix warnings treated as
> errors with W=1:
>
>   arch/powerpc/platforms/chrp/setup.c:97:6: error: no previous  
> prototype for ‘chrp_show_cpuinfo’ [-Werror=missing-prototypes]
>   arch/powerpc/platforms/chrp/setup.c:302:13: error: no previous  
> prototype for ‘chrp_setup_arch’ [-Werror=missing-prototypes]
>   arch/powerpc/platforms/chrp/setup.c:385:16: error: variable  
> ‘idu_size’ set but not used [-Werror=unused-but-set-variable]
>   arch/powerpc/platforms/chrp/setup.c:526:13: error: no previous  
> prototype for ‘chrp_init_IRQ’ [-Werror=missing-prototypes]
>   arch/powerpc/platforms/chrp/setup.c:559:1: error: no previous  
> prototype for ‘chrp_init2’ [-Werror=missing-prototypes]
>
> Suggested-by: Christophe Leroy <christophe.leroy at c-s.fr>
> Signed-off-by: Mathieu Malaterre <malat at debian.org>
> ---
> v2: Remove totally variable idu_size
>  arch/powerpc/platforms/chrp/setup.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/arch/powerpc/platforms/chrp/setup.c  
> b/arch/powerpc/platforms/chrp/setup.c
> index 481ed133e04b..d6d8ffc0271e 100644
> --- a/arch/powerpc/platforms/chrp/setup.c
> +++ b/arch/powerpc/platforms/chrp/setup.c
> @@ -94,7 +94,7 @@ static const char *chrp_names[] = {
>  	"Total Impact Briq"
>  };
>
> -void chrp_show_cpuinfo(struct seq_file *m)
> +static void chrp_show_cpuinfo(struct seq_file *m)
>  {
>  	int i, sdramen;
>  	unsigned int t;
> @@ -299,7 +299,7 @@ static __init void chrp_init(void)
>  	of_node_put(node);
>  }
>
> -void __init chrp_setup_arch(void)
> +static void __init chrp_setup_arch(void)
>  {
>  	struct device_node *root = of_find_node_by_path("/");
>  	const char *machine = NULL;
> @@ -382,7 +382,7 @@ static void __init chrp_find_openpic(void)
>  {
>  	struct device_node *np, *root;
>  	int len, i, j;
> -	int isu_size, idu_size;
> +	int isu_size;
>  	const unsigned int *iranges, *opprop = NULL;
>  	int oplen = 0;
>  	unsigned long opaddr;
> @@ -427,11 +427,9 @@ static void __init chrp_find_openpic(void)
>  	}
>
>  	isu_size = 0;
> -	idu_size = 0;
>  	if (len > 0 && iranges[1] != 0) {
>  		printk(KERN_INFO "OpenPIC irqs %d..%d in IDU\n",
>  		       iranges[0], iranges[0] + iranges[1] - 1);
> -		idu_size = iranges[1];
>  	}
>  	if (len > 1)
>  		isu_size = iranges[3];
> @@ -523,7 +521,7 @@ static void __init chrp_find_8259(void)
>  	}
>  }
>
> -void __init chrp_init_IRQ(void)
> +static void __init chrp_init_IRQ(void)
>  {
>  #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) &&  
> defined(CONFIG_XMON)
>  	struct device_node *kbd;
> @@ -555,7 +553,7 @@ void __init chrp_init_IRQ(void)
>  #endif
>  }
>
> -void __init
> +static void __init
>  chrp_init2(void)
>  {
>  #ifdef CONFIG_NVRAM
> --
> 2.11.0