Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Amir Mahdi Ghorbanian <indigoomega021@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

authored by

Amir Mahdi Ghorbanian and committed by
Miquel Raynal
44f45994 4aa906f1

+14 -13
+6 -5
drivers/mtd/nand/onenand/omap2.c
··· 148 148 unsigned long timeout; 149 149 u32 syscfg; 150 150 151 - if (state == FL_RESETING || state == FL_PREPARING_ERASE || 151 + if (state == FL_RESETTING || state == FL_PREPARING_ERASE || 152 152 state == FL_VERIFYING_ERASE) { 153 153 int i = 21; 154 154 unsigned int intr_flags = ONENAND_INT_MASTER; 155 155 156 156 switch (state) { 157 - case FL_RESETING: 157 + case FL_RESETTING: 158 158 intr_flags |= ONENAND_INT_RESET; 159 159 break; 160 160 case FL_PREPARING_ERASE: ··· 375 375 * context fallback to PIO mode. 376 376 */ 377 377 if (!virt_addr_valid(buf) || bram_offset & 3 || (size_t)buf & 3 || 378 - count < 384 || in_interrupt() || oops_in_progress ) 378 + count < 384 || in_interrupt() || oops_in_progress) 379 379 goto out_copy; 380 380 381 381 xtra = count & 3; ··· 422 422 * context fallback to PIO mode. 423 423 */ 424 424 if (!virt_addr_valid(buf) || bram_offset & 3 || (size_t)buf & 3 || 425 - count < 384 || in_interrupt() || oops_in_progress ) 425 + count < 384 || in_interrupt() || oops_in_progress) 426 426 goto out_copy; 427 427 428 428 dma_src = dma_map_single(dev, buf, count, DMA_TO_DEVICE); ··· 528 528 c->gpmc_cs, c->phys_base, c->onenand.base, 529 529 c->dma_chan ? "DMA" : "PIO"); 530 530 531 - if ((r = onenand_scan(&c->mtd, 1)) < 0) 531 + r = onenand_scan(&c->mtd, 1); 532 + if (r < 0) 532 533 goto err_release_dma; 533 534 534 535 freq = omap2_onenand_get_freq(c->onenand.version_id);
+7 -7
drivers/mtd/nand/onenand/onenand_base.c
··· 2853 2853 2854 2854 /* Exit OTP access mode */ 2855 2855 this->command(mtd, ONENAND_CMD_RESET, 0, 0); 2856 - this->wait(mtd, FL_RESETING); 2856 + this->wait(mtd, FL_RESETTING); 2857 2857 2858 2858 status = this->read_word(this->base + ONENAND_REG_CTRL_STATUS); 2859 2859 status &= 0x60; ··· 2924 2924 2925 2925 /* Exit OTP access mode */ 2926 2926 this->command(mtd, ONENAND_CMD_RESET, 0, 0); 2927 - this->wait(mtd, FL_RESETING); 2927 + this->wait(mtd, FL_RESETTING); 2928 2928 2929 2929 return ret; 2930 2930 } ··· 2968 2968 2969 2969 /* Exit OTP access mode */ 2970 2970 this->command(mtd, ONENAND_CMD_RESET, 0, 0); 2971 - this->wait(mtd, FL_RESETING); 2971 + this->wait(mtd, FL_RESETTING); 2972 2972 2973 2973 return ret; 2974 2974 } ··· 3008 3008 3009 3009 /* Exit OTP access mode */ 3010 3010 this->command(mtd, ONENAND_CMD_RESET, 0, 0); 3011 - this->wait(mtd, FL_RESETING); 3011 + this->wait(mtd, FL_RESETTING); 3012 3012 } else { 3013 3013 ops.mode = MTD_OPS_PLACE_OOB; 3014 3014 ops.ooblen = len; ··· 3413 3413 this->boundary[die] = bdry & FLEXONENAND_PI_MASK; 3414 3414 3415 3415 this->command(mtd, ONENAND_CMD_RESET, 0, 0); 3416 - this->wait(mtd, FL_RESETING); 3416 + this->wait(mtd, FL_RESETTING); 3417 3417 3418 3418 printk(KERN_INFO "Die %d boundary: %d%s\n", die, 3419 3419 this->boundary[die], locked ? "(Locked)" : "(Unlocked)"); ··· 3635 3635 ret = this->wait(mtd, FL_WRITING); 3636 3636 out: 3637 3637 this->write_word(ONENAND_CMD_RESET, this->base + ONENAND_REG_COMMAND); 3638 - this->wait(mtd, FL_RESETING); 3638 + this->wait(mtd, FL_RESETTING); 3639 3639 if (!ret) 3640 3640 /* Recalculate device size on boundary change*/ 3641 3641 flexonenand_get_size(mtd); ··· 3671 3671 /* Reset OneNAND to read default register values */ 3672 3672 this->write_word(ONENAND_CMD_RESET, this->base + ONENAND_BOOTRAM); 3673 3673 /* Wait reset */ 3674 - this->wait(mtd, FL_RESETING); 3674 + this->wait(mtd, FL_RESETTING); 3675 3675 3676 3676 /* Restore system configuration 1 */ 3677 3677 this->write_word(syscfg, this->base + ONENAND_REG_SYS_CFG1);
+1 -1
include/linux/mtd/flashchip.h
··· 40 40 FL_READING, 41 41 FL_CACHEDPRG, 42 42 /* These 4 come from onenand_state_t, which has been unified here */ 43 - FL_RESETING, 43 + FL_RESETTING, 44 44 FL_OTPING, 45 45 FL_PREPARING_ERASE, 46 46 FL_VERIFYING_ERASE,