Commit 44f45994 authored by Amir Mahdi Ghorbanian's avatar Amir Mahdi Ghorbanian Committed by Miquel Raynal
Browse files

mtd: onenand: omap2: Fix errors in style 



Correct mispelling, spacing, and coding style flaws caught by
checkpatch.pl script in the Omap2 Onenand driver .

Signed-off-by: default avatarAmir Mahdi Ghorbanian <indigoomega021@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 4aa906f1

drivers/mtd/nand/onenand/omap2.c

+6 −5
Original line number Diff line number Diff line
@@ -148,13 +148,13 @@ static int omap2_onenand_wait(struct mtd_info *mtd, int state) 
	unsigned long timeout;

	u32 syscfg;



	if (state == FL_RESETING || state == FL_PREPARING_ERASE ||

	if (state == FL_RESETTING || state == FL_PREPARING_ERASE ||

	    state == FL_VERIFYING_ERASE) {

		int i = 21;

		unsigned int intr_flags = ONENAND_INT_MASTER;



		switch (state) {

		case FL_RESETING:

		case FL_RESETTING:

			intr_flags |= ONENAND_INT_RESET;

			break;

		case FL_PREPARING_ERASE:
@@ -528,7 +528,8 @@ static int omap2_onenand_probe(struct platform_device *pdev) 
		 c->gpmc_cs, c->phys_base, c->onenand.base,

		 c->dma_chan ? "DMA" : "PIO");



	if ((r = onenand_scan(&c->mtd, 1)) < 0)

	r = onenand_scan(&c->mtd, 1);

	if (r < 0)

		goto err_release_dma;



	freq = omap2_onenand_get_freq(c->onenand.version_id);

drivers/mtd/nand/onenand/onenand_base.c

+7 −7
Original line number Diff line number Diff line
@@ -2853,7 +2853,7 @@ static int onenand_otp_write_oob_nolock(struct mtd_info *mtd, loff_t to, 


		/* Exit OTP access mode */

		this->command(mtd, ONENAND_CMD_RESET, 0, 0);

		this->wait(mtd, FL_RESETING);

		this->wait(mtd, FL_RESETTING);



		status = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);

		status &= 0x60;
@@ -2924,7 +2924,7 @@ static int do_otp_read(struct mtd_info *mtd, loff_t from, size_t len, 


	/* Exit OTP access mode */

	this->command(mtd, ONENAND_CMD_RESET, 0, 0);

	this->wait(mtd, FL_RESETING);

	this->wait(mtd, FL_RESETTING);



	return ret;

}
@@ -2968,7 +2968,7 @@ static int do_otp_write(struct mtd_info *mtd, loff_t to, size_t len, 


	/* Exit OTP access mode */

	this->command(mtd, ONENAND_CMD_RESET, 0, 0);

	this->wait(mtd, FL_RESETING);

	this->wait(mtd, FL_RESETTING);



	return ret;

}
@@ -3008,7 +3008,7 @@ static int do_otp_lock(struct mtd_info *mtd, loff_t from, size_t len, 


		/* Exit OTP access mode */

		this->command(mtd, ONENAND_CMD_RESET, 0, 0);

		this->wait(mtd, FL_RESETING);

		this->wait(mtd, FL_RESETTING);

	} else {

		ops.mode = MTD_OPS_PLACE_OOB;

		ops.ooblen = len;
@@ -3413,7 +3413,7 @@ static int flexonenand_get_boundary(struct mtd_info *mtd) 
		this->boundary[die] = bdry & FLEXONENAND_PI_MASK;



		this->command(mtd, ONENAND_CMD_RESET, 0, 0);

		this->wait(mtd, FL_RESETING);

		this->wait(mtd, FL_RESETTING);



		printk(KERN_INFO "Die %d boundary: %d%s\n", die,

		       this->boundary[die], locked ? "(Locked)" : "(Unlocked)");
@@ -3635,7 +3635,7 @@ static int flexonenand_set_boundary(struct mtd_info *mtd, int die, 
	ret = this->wait(mtd, FL_WRITING);

out:

	this->write_word(ONENAND_CMD_RESET, this->base + ONENAND_REG_COMMAND);

	this->wait(mtd, FL_RESETING);

	this->wait(mtd, FL_RESETTING);

	if (!ret)

		/* Recalculate device size on boundary change*/

		flexonenand_get_size(mtd);
@@ -3671,7 +3671,7 @@ static int onenand_chip_probe(struct mtd_info *mtd) 
	/* Reset OneNAND to read default register values */

	this->write_word(ONENAND_CMD_RESET, this->base + ONENAND_BOOTRAM);

	/* Wait reset */

	this->wait(mtd, FL_RESETING);

	this->wait(mtd, FL_RESETTING);



	/* Restore system configuration 1 */

	this->write_word(syscfg, this->base + ONENAND_REG_SYS_CFG1);

include/linux/mtd/flashchip.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ typedef enum { 
	FL_READING,

	FL_CACHEDPRG,

	/* These 4 come from onenand_state_t, which has been unified here */

	FL_RESETING,

	FL_RESETTING,

	FL_OTPING,

	FL_PREPARING_ERASE,

	FL_VERIFYING_ERASE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE