Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8ac0414 authored by Florian Fainelli's avatar Florian Fainelli Committed by David Woodhouse
Browse files

mtd: fix all checkpatch errors in nand_base.c 



Artem: it is much easier to verify patches against nand_base.c with
       checkpatch.pl when nand_base.c itself does not have so many
       checkpatch.pl warnings.

Signed-off-by: default avatarFlorian Fainelli <ffainelli@freebox.fr>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 2bdb053a

drivers/mtd/nand/nand_base.c

+26 −23
Original line number Diff line number Diff line
@@ -612,7 +612,8 @@ static void nand_command(struct mtd_info *mtd, unsigned int command, 
			       NAND_CTRL_CLE | NAND_CTRL_CHANGE);

		chip->cmd_ctrl(mtd,

			       NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);

		while (!(chip->read_byte(mtd) & NAND_STATUS_READY)) ;

		while (!(chip->read_byte(mtd) & NAND_STATUS_READY))

				;

		return;



		/* This applies to read commands */
@@ -718,7 +719,8 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned int command, 
			       NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);

		chip->cmd_ctrl(mtd, NAND_CMD_NONE,

			       NAND_NCE | NAND_CTRL_CHANGE);

		while (!(chip->read_byte(mtd) & NAND_STATUS_READY)) ;

		while (!(chip->read_byte(mtd) & NAND_STATUS_READY))

				;

		return;



	case NAND_CMD_RNDOUT:
@@ -2137,7 +2139,7 @@ static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob, size_t len, 
	return NULL;

}



#define NOTALIGNED(x)	(x & (chip->subpagesize - 1)) != 0

#define NOTALIGNED(x)	((x & (chip->subpagesize - 1)) != 0)



/**

 * nand_do_write_ops - [Internal] NAND write with ECC
@@ -2706,7 +2708,8 @@ static int nand_block_markbad(struct mtd_info *mtd, loff_t ofs) 
	struct nand_chip *chip = mtd->priv;

	int ret;



	if ((ret = nand_block_isbad(mtd, ofs))) {

	ret = nand_block_isbad(mtd, ofs);

	if (ret) {

		/* If it was bad already, return success and do nothing. */

		if (ret > 0)

			return 0;