|
@@ -3525,7 +3525,7 @@ static int flexonenand_get_boundary(struct mtd_info *mtd)
|
|
|
{
|
|
|
struct onenand_chip *this = mtd->priv;
|
|
|
unsigned die, bdry;
|
|
|
- int ret, syscfg, locked;
|
|
|
+ int syscfg, locked;
|
|
|
|
|
|
/* Disable ECC */
|
|
|
syscfg = this->read_word(this->base + ONENAND_REG_SYS_CFG1);
|
|
@@ -3536,7 +3536,7 @@ static int flexonenand_get_boundary(struct mtd_info *mtd)
|
|
|
this->wait(mtd, FL_SYNCING);
|
|
|
|
|
|
this->command(mtd, FLEXONENAND_CMD_READ_PI, die, 0);
|
|
|
- ret = this->wait(mtd, FL_READING);
|
|
|
+ this->wait(mtd, FL_READING);
|
|
|
|
|
|
bdry = this->read_word(this->base + ONENAND_DATARAM);
|
|
|
if ((bdry >> FLEXONENAND_PI_UNLOCK_SHIFT) == 3)
|
|
@@ -3546,7 +3546,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);
|
|
|
- ret = this->wait(mtd, FL_RESETING);
|
|
|
+ this->wait(mtd, FL_RESETING);
|
|
|
|
|
|
printk(KERN_INFO "Die %d boundary: %d%s\n", die,
|
|
|
this->boundary[die], locked ? "(Locked)" : "(Unlocked)");
|
|
@@ -3730,7 +3730,7 @@ static int flexonenand_set_boundary(struct mtd_info *mtd, int die,
|
|
|
|
|
|
/* Check is boundary is locked */
|
|
|
this->command(mtd, FLEXONENAND_CMD_READ_PI, die, 0);
|
|
|
- ret = this->wait(mtd, FL_READING);
|
|
|
+ this->wait(mtd, FL_READING);
|
|
|
|
|
|
thisboundary = this->read_word(this->base + ONENAND_DATARAM);
|
|
|
if ((thisboundary >> FLEXONENAND_PI_UNLOCK_SHIFT) != 3) {
|
|
@@ -3831,7 +3831,7 @@ static int onenand_chip_probe(struct mtd_info *mtd)
|
|
|
static int onenand_probe(struct mtd_info *mtd)
|
|
|
{
|
|
|
struct onenand_chip *this = mtd->priv;
|
|
|
- int maf_id, dev_id, ver_id;
|
|
|
+ int dev_id, ver_id;
|
|
|
int density;
|
|
|
int ret;
|
|
|
|
|
@@ -3839,8 +3839,7 @@ static int onenand_probe(struct mtd_info *mtd)
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
- /* Read manufacturer and device IDs from Register */
|
|
|
- maf_id = this->read_word(this->base + ONENAND_REG_MANUFACTURER_ID);
|
|
|
+ /* Device and version IDs from Register */
|
|
|
dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID);
|
|
|
ver_id = this->read_word(this->base + ONENAND_REG_VERSION_ID);
|
|
|
this->technology = this->read_word(this->base + ONENAND_REG_TECHNOLOGY);
|