mtd: onenand_base: Adjust indentation in onenand_read_ops_nolock
Subsystems (3)
PATCH 1/1 mtd: onenand_base: Adjust indentation in onenand_read_ops_nolock
Clang warns:
../drivers/mtd/nand/onenand/onenand_base.c:1269:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
while (!ret) {
^../drivers/mtd/nand/onenand/onenand_base.c:1266:2: note: previous statement is here
if (column + thislen > writesize)
^
1 warning generated.
This warning occurs because there is a space before the tab of the while loop. There are spaces at the beginning of a lot of the lines in this block, remove them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.
--- drivers/mtd/nand/onenand/onenand_base.c | 64 ++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-)
drivers/mtd/nand/onenand/onenand_base.c +32 -32
@@ -1266,26 +1266,26 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,if (column + thislen > writesize) thislen = writesize - column; -while (!ret) { -/* If there is more to load then start next load */ - from += thislen; -if (read + thislen < len) { +while (!ret) { +/* If there is more to load then start next load */ + from += thislen; +if (read + thislen < len) { this->command (mtd,ONENAND_CMD_READ , from, writesize); -/* -* Chip boundary handling in DDP -* Now we issued chip 1 read and pointed chip 1 +/* +* Chip boundary handling in DDP +* Now we issued chip 1 read and pointed chip 1 * bufferram so we have to point chip 0 bufferram. -*/ -if (ONENAND_IS_DDP (this) && -unlikely (from == (this->chipsize >>1 ))) { - this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); - boundary =1 ; - }else - boundary =0 ; -ONENAND_SET_PREV_BUFFERRAM (this); - } -/* While load is going, read from last bufferRAM */ - this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen); +*/ +if (ONENAND_IS_DDP (this) && +unlikely (from == (this->chipsize >>1 ))) { + this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); + boundary =1 ; + }else + boundary =0 ; +ONENAND_SET_PREV_BUFFERRAM (this); + } +/* While load is going, read from last bufferRAM */ + this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen);/* Read oob area if needed */ if (oobbuf) {
@@ -1302,23 +1302,23 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, }/* See if we are done */ - read += thislen; -if (read == len) -break ; -/* Set up for next read from bufferRAM */ -if (unlikely (boundary)) - this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); -ONENAND_SET_NEXT_BUFFERRAM (this); - buf += thislen; + read += thislen; +if (read == len) +break ; +/* Set up for next read from bufferRAM */ +if (unlikely (boundary)) + this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); +ONENAND_SET_NEXT_BUFFERRAM (this); + buf += thislen; thislen =min_t (int, writesize, len - read); - column =0 ; -cond_resched (); -/* Now wait for load */ - ret = this->wait (mtd,FL_READING ); -onenand_update_bufferram (mtd, from, !ret); + column =0 ; +cond_resched (); +/* Now wait for load */ + ret = this->wait (mtd,FL_READING ); +onenand_update_bufferram (mtd, from, !ret);if (mtd_is_eccerr (ret)) ret =0 ; - } + }/* * Return success, if no ECC failures, else -EBADMSG
Signature · 1 line
2.24.0
drivers/mtd/nand/onenand/onenand_base.c static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,
Quoted 31 lines · Nathan Chancellor
Clang warns:
../drivers/mtd/nand/onenand/onenand_base.c:1269:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]while (!ret) { ^
../drivers/mtd/nand/onenand/onenand_base.c:1266:2: note: previous statement is here
if (column + thislen > writesize)
^
1 warning generated.This warning occurs because there is a space before the tab of the while loop. There are spaces at the beginning of a lot of the lines in this block, remove them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.
Fixes a8de85d55700 ("[MTD] OneNAND: Implement read-while-load")Signed-off-by Nathan Chancellor <[email protected]>--- drivers/mtd/nand/onenand/onenand_base.c | 64 ++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-)drivers/mtd/nand/onenand/onenand_base.c +0
-0@@ -1266,26 +1266,26 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,
There is more in this function before this hunk that could be cleaned up as well.
Quoted 89 lines
drivers/mtd/nand/onenand/onenand_base.c +32
-33if (column + thislen > writesize) thislen = writesize - column; -while (!ret) { -/* If there is more to load then start next load */ - from += thislen; -if (read + thislen < len) { +while (!ret) { +/* If there is more to load then start next load */ + from += thislen; +if (read + thislen < len) { this->command (mtd,ONENAND_CMD_READ , from, writesize); -/* -* Chip boundary handling in DDP -* Now we issued chip 1 read and pointed chip 1 +/* +* Chip boundary handling in DDP +* Now we issued chip 1 read and pointed chip 1 * bufferram so we have to point chip 0 bufferram. -*/ -if (ONENAND_IS_DDP (this) && -unlikely (from == (this->chipsize >>1 ))) { - this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); - boundary =1 ; - }else - boundary =0 ; -ONENAND_SET_PREV_BUFFERRAM (this); - } -/* While load is going, read from last bufferRAM */ - this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen); +*/ +if (ONENAND_IS_DDP (this) && +unlikely (from == (this->chipsize >>1 ))) { + this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); + boundary =1 ; + }else + boundary =0 ; +ONENAND_SET_PREV_BUFFERRAM (this); + } +/* While load is going, read from last bufferRAM */ + this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen);/* Read oob area if needed */ if (oobbuf) {@@ -1302,23 +1302,23 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, }/* See if we are done */ - read += thislen; -if (read == len) -break ; -/* Set up for next read from bufferRAM */ -if (unlikely (boundary)) - this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); -ONENAND_SET_NEXT_BUFFERRAM (this); - buf += thislen; + read += thislen; +if (read == len) +break ; +/* Set up for next read from bufferRAM */ +if (unlikely (boundary)) + this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); +ONENAND_SET_NEXT_BUFFERRAM (this); + buf += thislen; thislen =min_t (int, writesize, len - read); - column =0 ; -cond_resched (); -/* Now wait for load */ - ret = this->wait (mtd,FL_READING ); -onenand_update_bufferram (mtd, from, !ret); + column =0 ; +cond_resched (); +/* Now wait for load */ + ret = this->wait (mtd,FL_READING ); +onenand_update_bufferram (mtd, from, !ret);if (mtd_is_eccerr (ret)) ret =0 ; - } + }/* * Return success, if no ECC failures, else -EBADMSG -- 2.24.0
--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20191209205010.4115-1-natechancellor%40gmail.com.
Signature · 2 lines
Thanks, ~Nick Desaulniers
PATCH v2 1/1 mtd: onenand_base: Adjust indentation in onenand_read_ops_nolock
In reply to Nathan ChancellorClang warns:
../drivers/mtd/nand/onenand/onenand_base.c:1269:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
while (!ret) {
^../drivers/mtd/nand/onenand/onenand_base.c:1266:2: note: previous statement is here
if (column + thislen > writesize)
^
1 warning generated.
This warning occurs because there is a space before the tab of the while loop. There are spaces at the beginning of a lot of the lines in this block, remove them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.
---
v1 -> v2:
* Clean up the block before the one that warns, which was added as part of the fixes commit (Nick).
drivers/mtd/nand/onenand/onenand_base.c | 80 ++++++++++++------------- 1 file changed, 40 insertions(+), 40 deletions(-)
drivers/mtd/nand/onenand/onenand_base.c +40 -40
@@ -1248,44 +1248,44 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, stats = mtd->ecc_stats; -/* Read-while-load method */ +/* Read-while-load method */ -/* Do first load to bufferRAM */ -if (read < len) { -if (!onenand_check_bufferram (mtd, from)) { +/* Do first load to bufferRAM */ +if (read < len) { +if (!onenand_check_bufferram (mtd, from)) { this->command (mtd,ONENAND_CMD_READ , from, writesize); - ret = this->wait (mtd,FL_READING ); -onenand_update_bufferram (mtd, from, !ret); + ret = this->wait (mtd,FL_READING ); +onenand_update_bufferram (mtd, from, !ret);if (mtd_is_eccerr (ret)) ret =0 ; - } - } + } + } thislen =min_t (int, writesize, len - read); column = from & (writesize -1 );if (column + thislen > writesize) thislen = writesize - column; -while (!ret) { -/* If there is more to load then start next load */ - from += thislen; -if (read + thislen < len) { +while (!ret) { +/* If there is more to load then start next load */ + from += thislen; +if (read + thislen < len) { this->command (mtd,ONENAND_CMD_READ , from, writesize); -/* -* Chip boundary handling in DDP -* Now we issued chip 1 read and pointed chip 1 +/* +* Chip boundary handling in DDP +* Now we issued chip 1 read and pointed chip 1 * bufferram so we have to point chip 0 bufferram. -*/ -if (ONENAND_IS_DDP (this) && -unlikely (from == (this->chipsize >>1 ))) { - this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); - boundary =1 ; - }else - boundary =0 ; -ONENAND_SET_PREV_BUFFERRAM (this); - } -/* While load is going, read from last bufferRAM */ - this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen); +*/ +if (ONENAND_IS_DDP (this) && +unlikely (from == (this->chipsize >>1 ))) { + this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); + boundary =1 ; + }else + boundary =0 ; +ONENAND_SET_PREV_BUFFERRAM (this); + } +/* While load is going, read from last bufferRAM */ + this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen);/* Read oob area if needed */ if (oobbuf) {
@@ -1302,23 +1302,23 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, }/* See if we are done */ - read += thislen; -if (read == len) -break ; -/* Set up for next read from bufferRAM */ -if (unlikely (boundary)) - this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); -ONENAND_SET_NEXT_BUFFERRAM (this); - buf += thislen; + read += thislen; +if (read == len) +break ; +/* Set up for next read from bufferRAM */ +if (unlikely (boundary)) + this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); +ONENAND_SET_NEXT_BUFFERRAM (this); + buf += thislen; thislen =min_t (int, writesize, len - read); - column =0 ; -cond_resched (); -/* Now wait for load */ - ret = this->wait (mtd,FL_READING ); -onenand_update_bufferram (mtd, from, !ret); + column =0 ; +cond_resched (); +/* Now wait for load */ + ret = this->wait (mtd,FL_READING ); +onenand_update_bufferram (mtd, from, !ret);if (mtd_is_eccerr (ret)) ret =0 ; - } + }/* * Return success, if no ECC failures, else -EBADMSG
Signature · 1 line
2.24.0
Quoted 108 lines · Nathan Chancellor
Clang warns:
../drivers/mtd/nand/onenand/onenand_base.c:1269:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]while (!ret) { ^
../drivers/mtd/nand/onenand/onenand_base.c:1266:2: note: previous statement is here
if (column + thislen > writesize)
^
1 warning generated.This warning occurs because there is a space before the tab of the while loop. There are spaces at the beginning of a lot of the lines in this block, remove them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.
Fixes a8de85d55700 ("[MTD] OneNAND: Implement read-while-load")Signed-off-by Nathan Chancellor <[email protected]>---
v1 -> v2:
* Clean up the block before the one that warns, which was added as part of the fixes commit (Nick).
drivers/mtd/nand/onenand/onenand_base.c | 80 ++++++++++++------------- 1 file changed, 40 insertions(+), 40 deletions(-)drivers/mtd/nand/onenand/onenand_base.c +26
-26@@ -1248,44 +1248,44 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, stats = mtd->ecc_stats; -/* Read-while-load method */ +/* Read-while-load method */ -/* Do first load to bufferRAM */ -if (read < len) { -if (!onenand_check_bufferram (mtd, from)) { +/* Do first load to bufferRAM */ +if (read < len) { +if (!onenand_check_bufferram (mtd, from)) { this->command (mtd,ONENAND_CMD_READ , from, writesize); - ret = this->wait (mtd,FL_READING ); -onenand_update_bufferram (mtd, from, !ret); + ret = this->wait (mtd,FL_READING ); +onenand_update_bufferram (mtd, from, !ret);if (mtd_is_eccerr (ret)) ret =0 ; - } - } + } + } thislen =min_t (int, writesize, len - read); column = from & (writesize -1 );if (column + thislen > writesize) thislen = writesize - column; -while (!ret) { -/* If there is more to load then start next load */ - from += thislen; -if (read + thislen < len) { +while (!ret) { +/* If there is more to load then start next load */ + from += thislen; +if (read + thislen < len) { this->command (mtd,ONENAND_CMD_READ , from, writesize); -/* -* Chip boundary handling in DDP -* Now we issued chip 1 read and pointed chip 1 +/* +* Chip boundary handling in DDP +* Now we issued chip 1 read and pointed chip 1 * bufferram so we have to point chip 0 bufferram. -*/ -if (ONENAND_IS_DDP (this) && -unlikely (from == (this->chipsize >>1 ))) { - this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); - boundary =1 ; - }else - boundary =0 ; -ONENAND_SET_PREV_BUFFERRAM (this); - } -/* While load is going, read from last bufferRAM */ - this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen); +*/ +if (ONENAND_IS_DDP (this) && +unlikely (from == (this->chipsize >>1 ))) { + this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); + boundary =1 ; + }else + boundary =0 ; +ONENAND_SET_PREV_BUFFERRAM (this); + } +/* While load is going, read from last bufferRAM */ + this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen);/* Read oob area if needed */ if (oobbuf) {
drivers/mtd/nand/onenand/onenand_base.c static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, · line 1304
Quoted 3 lines
drivers/mtd/nand/onenand/onenand_base.c +0
-0@@ -1302,23 +1302,23 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, }/* See if we are done */
With this applied, I see a missed instance right here ^ (L1304). In vim:
^ \t
In my .vimrc, I set:
https://github.com/nickdesaulniers/dotfiles/blob/37359525f5a403b4ed2d3f9d1bbbee2da8ec8115/.vimrc#L35-L41
to make tabs glaringly visible.
Quoted 41 lines
drivers/mtd/nand/onenand/onenand_base.c +14
-15- read += thislen; -if (read == len) -break ; -/* Set up for next read from bufferRAM */ -if (unlikely (boundary)) - this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); -ONENAND_SET_NEXT_BUFFERRAM (this); - buf += thislen; + read += thislen; +if (read == len) +break ; +/* Set up for next read from bufferRAM */ +if (unlikely (boundary)) + this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); +ONENAND_SET_NEXT_BUFFERRAM (this); + buf += thislen; thislen =min_t (int, writesize, len - read); - column =0 ; -cond_resched (); -/* Now wait for load */ - ret = this->wait (mtd,FL_READING ); -onenand_update_bufferram (mtd, from, !ret); + column =0 ; +cond_resched (); +/* Now wait for load */ + ret = this->wait (mtd,FL_READING ); +onenand_update_bufferram (mtd, from, !ret);if (mtd_is_eccerr (ret)) ret =0 ; - } + }/* * Return success, if no ECC failures, else -EBADMSG -- 2.24.0
--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20191209210328.18866-1-natechancellor%40gmail.com.
Signature · 2 lines
Thanks, ~Nick Desaulniers
PATCH v3 1/1 mtd: onenand_base: Adjust indentation in onenand_read_ops_nolock
In reply to Nathan ChancellorClang warns:
../drivers/mtd/nand/onenand/onenand_base.c:1269:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
while (!ret) {
^../drivers/mtd/nand/onenand/onenand_base.c:1266:2: note: previous statement is here
if (column + thislen > writesize)
^
1 warning generated.
This warning occurs because there is a space before the tab of the while loop. There are spaces at the beginning of a lot of the lines in this block, remove them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.
---
v1 -> v2:
* Clean up the block before the one that warns, which was added as part of the fixes commit (Nick).
v2 -> v3:
* Fix one missed conversion (Nick).
drivers/mtd/nand/onenand/onenand_base.c | 82 ++++++++++++------------- 1 file changed, 41 insertions(+), 41 deletions(-)
drivers/mtd/nand/onenand/onenand_base.c +41 -41
@@ -1248,44 +1248,44 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, stats = mtd->ecc_stats; -/* Read-while-load method */ +/* Read-while-load method */ -/* Do first load to bufferRAM */ -if (read < len) { -if (!onenand_check_bufferram (mtd, from)) { +/* Do first load to bufferRAM */ +if (read < len) { +if (!onenand_check_bufferram (mtd, from)) { this->command (mtd,ONENAND_CMD_READ , from, writesize); - ret = this->wait (mtd,FL_READING ); -onenand_update_bufferram (mtd, from, !ret); + ret = this->wait (mtd,FL_READING ); +onenand_update_bufferram (mtd, from, !ret);if (mtd_is_eccerr (ret)) ret =0 ; - } - } + } + } thislen =min_t (int, writesize, len - read); column = from & (writesize -1 );if (column + thislen > writesize) thislen = writesize - column; -while (!ret) { -/* If there is more to load then start next load */ - from += thislen; -if (read + thislen < len) { +while (!ret) { +/* If there is more to load then start next load */ + from += thislen; +if (read + thislen < len) { this->command (mtd,ONENAND_CMD_READ , from, writesize); -/* -* Chip boundary handling in DDP -* Now we issued chip 1 read and pointed chip 1 +/* +* Chip boundary handling in DDP +* Now we issued chip 1 read and pointed chip 1 * bufferram so we have to point chip 0 bufferram. -*/ -if (ONENAND_IS_DDP (this) && -unlikely (from == (this->chipsize >>1 ))) { - this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); - boundary =1 ; - }else - boundary =0 ; -ONENAND_SET_PREV_BUFFERRAM (this); - } -/* While load is going, read from last bufferRAM */ - this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen); +*/ +if (ONENAND_IS_DDP (this) && +unlikely (from == (this->chipsize >>1 ))) { + this->write_word (ONENAND_DDP_CHIP0 , this->base +ONENAND_REG_START_ADDRESS2 ); + boundary =1 ; + }else + boundary =0 ; +ONENAND_SET_PREV_BUFFERRAM (this); + } +/* While load is going, read from last bufferRAM */ + this->read_bufferram (mtd,ONENAND_DATARAM , buf, column, thislen);/* Read oob area if needed */ if (oobbuf) {
@@ -1301,24 +1301,24 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, oobcolumn =0 ; } -/* See if we are done */ - read += thislen; -if (read == len) -break ; -/* Set up for next read from bufferRAM */ -if (unlikely (boundary)) - this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); -ONENAND_SET_NEXT_BUFFERRAM (this); - buf += thislen; +/* See if we are done */ + read += thislen; +if (read == len) +break ; +/* Set up for next read from bufferRAM */ +if (unlikely (boundary)) + this->write_word (ONENAND_DDP_CHIP1 , this->base +ONENAND_REG_START_ADDRESS2 ); +ONENAND_SET_NEXT_BUFFERRAM (this); + buf += thislen; thislen =min_t (int, writesize, len - read); - column =0 ; -cond_resched (); -/* Now wait for load */ - ret = this->wait (mtd,FL_READING ); -onenand_update_bufferram (mtd, from, !ret); + column =0 ; +cond_resched (); +/* Now wait for load */ + ret = this->wait (mtd,FL_READING ); +onenand_update_bufferram (mtd, from, !ret);if (mtd_is_eccerr (ret)) ret =0 ; - } + }/* * Return success, if no ECC failures, else -EBADMSG
Signature · 1 line
2.24.0
Quoted 13 lines · Nathan Chancellor
Clang warns:
../drivers/mtd/nand/onenand/onenand_base.c:1269:3: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]while (!ret) { ^
../drivers/mtd/nand/onenand/onenand_base.c:1266:2: note: previous statement is here
if (column + thislen > writesize)
^
1 warning generated.
Quoted 8 lines
This warning occurs because there is a space before the tab of the while loop. There are spaces at the beginning of a lot of the lines in this block, remove them so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.
Fixes a8de85d55700 ("[MTD] OneNAND: Implement read-while-load")Signed-off-by Nathan Chancellor <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel