[PATCH 04/11] mtd: nand: denali: remove detect_partition_feature()

[Marek Vasut]

On 11/09/2016 05:35 AM, Masahiro Yamada wrote:
> The denali->fwblks is set by detect_partition_feature(), but it is
> not referenced from anywhere.  That means the struct member fwblks
> and the whole of detect_partition_feature() are unneeded.
> 
> The comment block implies this function is only for Intel platforms.
> I found drivers/staging/spectra used to exist, but it was deleted by
> commit be7f39c5ecf5 ("Staging: delete spectra driver") 5 years ago.
> 
> So, I guess nobody would need this function any more.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>

Reviewed-by: Marek Vasut <marek.vasut at gmail.com>

> ---
> 
>  drivers/mtd/nand/denali.c | 29 -----------------------------
>  drivers/mtd/nand/denali.h |  9 ---------
>  2 files changed, 38 deletions(-)
> 
> diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
> index d6f1b29..80d3e26 100644
> --- a/drivers/mtd/nand/denali.c
> +++ b/drivers/mtd/nand/denali.c
> @@ -473,33 +473,6 @@ static void detect_max_banks(struct denali_nand_info *denali)
>  		denali->max_banks = 1 << (features & FEATURES__N_BANKS);
>  }
>  
> -static void detect_partition_feature(struct denali_nand_info *denali)
> -{
> -	/*
> -	 * For MRST platform, denali->fwblks represent the
> -	 * number of blocks firmware is taken,
> -	 * FW is in protect partition and MTD driver has no
> -	 * permission to access it. So let driver know how many
> -	 * blocks it can't touch.
> -	 */
> -	if (ioread32(denali->flash_reg + FEATURES) & FEATURES__PARTITION) {
> -		if ((ioread32(denali->flash_reg + PERM_SRC_ID(1)) &
> -			PERM_SRC_ID__SRCID) == SPECTRA_PARTITION_ID) {
> -			denali->fwblks =
> -			    ((ioread32(denali->flash_reg + MIN_MAX_BANK(1)) &
> -			      MIN_MAX_BANK__MIN_VALUE) *
> -			     denali->blksperchip)
> -			    +
> -			    (ioread32(denali->flash_reg + MIN_BLK_ADDR(1)) &
> -			    MIN_BLK_ADDR__VALUE);
> -		} else {
> -			denali->fwblks = SPECTRA_START_BLOCK;
> -		}
> -	} else {
> -		denali->fwblks = SPECTRA_START_BLOCK;
> -	}
> -}
> -
>  static uint16_t denali_nand_timing_set(struct denali_nand_info *denali)
>  {
>  	uint16_t status = PASS;
> @@ -551,8 +524,6 @@ static uint16_t denali_nand_timing_set(struct denali_nand_info *denali)
>  
>  	find_valid_banks(denali);
>  
> -	detect_partition_feature(denali);
> -
>  	/*
>  	 * If the user specified to override the default timings
>  	 * with a specific ONFI mode, we apply those changes here.
> diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
> index 0ce7344..7c0800d 100644
> --- a/drivers/mtd/nand/denali.h
> +++ b/drivers/mtd/nand/denali.h
> @@ -383,14 +383,6 @@
>  #define CLK_X  5
>  #define CLK_MULTI 4
>  
> -/* spectraswconfig.h */
> -#define CMD_DMA 0
> -
> -#define SPECTRA_PARTITION_ID    0
> -/**** Block Table and Reserved Block Parameters *****/
> -#define SPECTRA_START_BLOCK     3
> -#define NUM_FREE_BLOCKS_GATE    30
> -
>  /* KBV - Updated to LNW scratch register address */
>  #define SCRATCH_REG_ADDR    CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR
>  #define SCRATCH_REG_SIZE    64
> @@ -470,7 +462,6 @@ struct denali_nand_info {
>  	int irq;
>  
>  	uint32_t devnum;	/* represent how many nands connected */
> -	uint32_t fwblks; /* represent how many blocks FW used */
>  	uint32_t totalblks;
>  	uint32_t blksperchip;
>  	uint32_t bbtskipbytes;
> 


-- 
Best regards,
Marek Vasut