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

mtd: onenand: remove unused variable assignments

These variable assignments are never used (the variables are either
never used or are overwritten before use). This resolves some compiler
warnings like the following:

drivers/mtd/onenand/onenand_base.c: In function 'flexonenand_get_boundary':
drivers/mtd/onenand/onenand_base.c:3532:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
drivers/mtd/onenand/onenand_base.c: In function 'onenand_probe':
drivers/mtd/onenand/onenand_base.c:3838:6: warning: variable 'maf_id' set but not used [-Wunused-but-set-variable]

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>

+6 -7
+6 -7
drivers/mtd/onenand/onenand_base.c
··· 3525 3525 { 3526 3526 struct onenand_chip *this = mtd->priv; 3527 3527 unsigned die, bdry; 3528 - int ret, syscfg, locked; 3528 + int syscfg, locked; 3529 3529 3530 3530 /* Disable ECC */ 3531 3531 syscfg = this->read_word(this->base + ONENAND_REG_SYS_CFG1); ··· 3536 3536 this->wait(mtd, FL_SYNCING); 3537 3537 3538 3538 this->command(mtd, FLEXONENAND_CMD_READ_PI, die, 0); 3539 - ret = this->wait(mtd, FL_READING); 3539 + this->wait(mtd, FL_READING); 3540 3540 3541 3541 bdry = this->read_word(this->base + ONENAND_DATARAM); 3542 3542 if ((bdry >> FLEXONENAND_PI_UNLOCK_SHIFT) == 3) ··· 3546 3546 this->boundary[die] = bdry & FLEXONENAND_PI_MASK; 3547 3547 3548 3548 this->command(mtd, ONENAND_CMD_RESET, 0, 0); 3549 - ret = this->wait(mtd, FL_RESETING); 3549 + this->wait(mtd, FL_RESETING); 3550 3550 3551 3551 printk(KERN_INFO "Die %d boundary: %d%s\n", die, 3552 3552 this->boundary[die], locked ? "(Locked)" : "(Unlocked)"); ··· 3730 3730 3731 3731 /* Check is boundary is locked */ 3732 3732 this->command(mtd, FLEXONENAND_CMD_READ_PI, die, 0); 3733 - ret = this->wait(mtd, FL_READING); 3733 + this->wait(mtd, FL_READING); 3734 3734 3735 3735 thisboundary = this->read_word(this->base + ONENAND_DATARAM); 3736 3736 if ((thisboundary >> FLEXONENAND_PI_UNLOCK_SHIFT) != 3) { ··· 3831 3831 static int onenand_probe(struct mtd_info *mtd) 3832 3832 { 3833 3833 struct onenand_chip *this = mtd->priv; 3834 - int maf_id, dev_id, ver_id; 3834 + int dev_id, ver_id; 3835 3835 int density; 3836 3836 int ret; 3837 3837 ··· 3839 3839 if (ret) 3840 3840 return ret; 3841 3841 3842 - /* Read manufacturer and device IDs from Register */ 3843 - maf_id = this->read_word(this->base + ONENAND_REG_MANUFACTURER_ID); 3842 + /* Device and version IDs from Register */ 3844 3843 dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID); 3845 3844 ver_id = this->read_word(this->base + ONENAND_REG_VERSION_ID); 3846 3845 this->technology = this->read_word(this->base + ONENAND_REG_TECHNOLOGY);