[PATCH 2/3] at91sam9260/9g20ek: move sam9_smc_config modification inside definition

[Jean-Christophe PLAGNIOL-VILLARD]

On 11:42 Thu 31 Jan     , Fabio Porcedda wrote:
> This is a optimization.

Nack

I do not what to ifdef

this make the code not easy to check via the compiler

Best Regards,
J.
> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda at gmail.com>
> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> ---
>  arch/arm/boards/at91sam9260ek/init.c | 28 +++++++++++++---------------
>  1 file changed, 13 insertions(+), 15 deletions(-)
> 
> diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c
> index f0d8adf..5080f2a 100644
> --- a/arch/arm/boards/at91sam9260ek/init.c
> +++ b/arch/arm/boards/at91sam9260ek/init.c
> @@ -74,7 +74,11 @@ static struct sam9_smc_config ek_9260_nand_smc_config = {
>  	.write_cycle		= 5,
>  
>  	.mode			= AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
> -				  AT91_SMC_EXNWMODE_DISABLE,
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> +				  AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_16,
> +#else
> +				  AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8,
> +#endif
>  	.tdf_cycles		= 2,
>  };
>  
> @@ -93,27 +97,21 @@ static struct sam9_smc_config ek_9g20_nand_smc_config = {
>  	.write_cycle		= 7,
>  
>  	.mode			= AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
> -				  AT91_SMC_EXNWMODE_DISABLE,
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> +				  AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_16,
> +#else
> +				  AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8,
> +#endif
>  	.tdf_cycles		= 3,
>  };
>  
>  static void ek_add_device_nand(void)
>  {
> -	struct sam9_smc_config *smc;
> -
> +	/* configure chip-select 3 (NAND) */
>  	if (machine_is_at91sam9g20ek())
> -		smc = &ek_9g20_nand_smc_config;
> -	else
> -		smc = &ek_9260_nand_smc_config;
> -
> -	/* setup bus-width (8 or 16) */
> -	if (nand_pdata.bus_width_16)
> -		smc->mode |= AT91_SMC_DBW_16;
> +		sam9_smc_configure(0, 3, &ek_9g20_nand_smc_config);
>  	else
> -		smc->mode |= AT91_SMC_DBW_8;
> -
> -	/* configure chip-select 3 (NAND) */
> -	sam9_smc_configure(0, 3, smc);
> +		sam9_smc_configure(0, 3, &ek_9260_nand_smc_config);
>  
>  	at91_add_device_nand(&nand_pdata);
>  }
> -- 
> 1.8.1.1
>