[PATCH] mtd: Delete commented printk and add some space for required

[PATCH] mtd: Delete commented printk and add some space for required

[Deming Wang]

Delete commented printk for NFTL_findwriteunit and

NFTL_makefreeblock. Add required space for the variable blockofs

Signed-off-by: Deming Wang <wangdeming@inspur.com>
---
 drivers/mtd/nftlcore.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index 64d319e959b2..e3c17ed4c219 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -486,7 +486,6 @@ static u16 NFTL_makefreeblock( struct NFTLrecord *nftl , unsigned pendingblock)
 
 		while (EUN <= nftl->lastEUN) {
 			thislen++;
-			//printk("VUC %d reaches len %d with EUN %d\n", chain, thislen, EUN);
 			EUN = nftl->ReplUnitTable[EUN] & 0x7fff;
 			if (thislen > 0xff00) {
 				printk("Endless loop in Virtual Chain %d: Unit %x\n",
@@ -501,7 +500,6 @@ static u16 NFTL_makefreeblock( struct NFTLrecord *nftl , unsigned pendingblock)
 		}
 
 		if (thislen > ChainLength) {
-			//printk("New longest chain is %d with length %d\n", chain, thislen);
 			ChainLength = thislen;
 			LongestChain = chain;
 		}
@@ -525,7 +523,7 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
 	u16 thisVUC = block / (nftl->EraseSize / 512);
 	struct mtd_info *mtd = nftl->mbd.mtd;
 	unsigned int writeEUN;
-	unsigned long blockofs = (block * 512) & (nftl->EraseSize -1);
+	unsigned long blockofs = (block * 512) & (nftl->EraseSize - 1);
 	size_t retlen;
 	int silly, silly2 = 3;
 	struct nftl_oob oob;
@@ -592,10 +590,6 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
 			   a chain to make room.
 			*/
 
-			/* First remember the start of this chain */
-			//u16 startEUN = nftl->EUNtable[thisVUC];
-
-			//printk("Write to VirtualUnitChain %d, calling makefreeblock()\n", thisVUC);
 			writeEUN = NFTL_makefreeblock(nftl, BLOCK_NIL);
 
 			if (writeEUN == BLOCK_NIL) {
@@ -618,7 +612,6 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
 				printk(KERN_WARNING "Cannot make free space.\n");
 				return BLOCK_NIL;
 			}
-			//printk("Restarting scan\n");
 			continue;
 		}
 
-- 
2.27.0

Re: [PATCH] mtd: Delete commented printk and add some space for required

[Miquel Raynal]

Hi Deming,

wangdeming@inspur.com wrote on Thu, 6 Oct 2022 05:04:19 -0400:

> Delete commented printk for NFTL_findwriteunit and
> 
> NFTL_makefreeblock. Add required space for the variable blockofs

I would rather not delete these comments because they are very old and
I believe were debugging lines in the past. I hope we will never have
to dig into this driver anymore but if we have to, I would suggest to
use debug printk's instead.

Also, if you want to clean up a bit the driver, you can go a little bit
further and address eg. all whitespace issues.

> Signed-off-by: Deming Wang <wangdeming@inspur.com>
> ---
>  drivers/mtd/nftlcore.c | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
> index 64d319e959b2..e3c17ed4c219 100644
> --- a/drivers/mtd/nftlcore.c
> +++ b/drivers/mtd/nftlcore.c
> @@ -486,7 +486,6 @@ static u16 NFTL_makefreeblock( struct NFTLrecord *nftl , unsigned pendingblock)
>  
>  		while (EUN <= nftl->lastEUN) {
>  			thislen++;
> -			//printk("VUC %d reaches len %d with EUN %d\n", chain, thislen, EUN);
>  			EUN = nftl->ReplUnitTable[EUN] & 0x7fff;
>  			if (thislen > 0xff00) {
>  				printk("Endless loop in Virtual Chain %d: Unit %x\n",
> @@ -501,7 +500,6 @@ static u16 NFTL_makefreeblock( struct NFTLrecord *nftl , unsigned pendingblock)
>  		}
>  
>  		if (thislen > ChainLength) {
> -			//printk("New longest chain is %d with length %d\n", chain, thislen);
>  			ChainLength = thislen;
>  			LongestChain = chain;
>  		}
> @@ -525,7 +523,7 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
>  	u16 thisVUC = block / (nftl->EraseSize / 512);
>  	struct mtd_info *mtd = nftl->mbd.mtd;
>  	unsigned int writeEUN;
> -	unsigned long blockofs = (block * 512) & (nftl->EraseSize -1);
> +	unsigned long blockofs = (block * 512) & (nftl->EraseSize - 1);
>  	size_t retlen;
>  	int silly, silly2 = 3;
>  	struct nftl_oob oob;
> @@ -592,10 +590,6 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
>  			   a chain to make room.
>  			*/
>  
> -			/* First remember the start of this chain */
> -			//u16 startEUN = nftl->EUNtable[thisVUC];
> -
> -			//printk("Write to VirtualUnitChain %d, calling makefreeblock()\n", thisVUC);
>  			writeEUN = NFTL_makefreeblock(nftl, BLOCK_NIL);
>  
>  			if (writeEUN == BLOCK_NIL) {
> @@ -618,7 +612,6 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
>  				printk(KERN_WARNING "Cannot make free space.\n");
>  				return BLOCK_NIL;
>  			}
> -			//printk("Restarting scan\n");
>  			continue;
>  		}
>  


Thanks,
Miquèl