Commit 5c8d2607 authored by Tadashi Abe's avatar Tadashi Abe Committed by David Woodhouse

mtd: remove duplicate assignment of chip->state

This is a trivial patch which removes unnecessary assignment of chip->state
in put_chip(). It's duplicated.
Signed-off-by: default avatarTadashi Abe <tabe@mvista.com>
Acked-by: default avatarJoakim Tjernlund <joakim.tjernlund@transmode.se>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 100f2341
...@@ -994,7 +994,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad ...@@ -994,7 +994,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad
switch(chip->oldstate) { switch(chip->oldstate) {
case FL_ERASING: case FL_ERASING:
chip->state = chip->oldstate;
/* What if one interleaved chip has finished and the /* What if one interleaved chip has finished and the
other hasn't? The old code would leave the finished other hasn't? The old code would leave the finished
one in READY mode. That's bad, and caused -EROFS one in READY mode. That's bad, and caused -EROFS
......
...@@ -761,7 +761,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad ...@@ -761,7 +761,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad
switch(chip->oldstate) { switch(chip->oldstate) {
case FL_ERASING: case FL_ERASING:
chip->state = chip->oldstate;
map_write(map, cfi->sector_erase_cmd, chip->in_progress_block_addr); map_write(map, cfi->sector_erase_cmd, chip->in_progress_block_addr);
chip->oldstate = FL_READY; chip->oldstate = FL_READY;
chip->state = FL_ERASING; chip->state = FL_ERASING;
......
...@@ -378,7 +378,6 @@ static void put_chip(struct map_info *map, struct flchip *chip) ...@@ -378,7 +378,6 @@ static void put_chip(struct map_info *map, struct flchip *chip)
switch (chip->oldstate) { switch (chip->oldstate) {
case FL_ERASING: case FL_ERASING:
chip->state = chip->oldstate;
map_write(map, CMD(LPDDR_RESUME), map_write(map, CMD(LPDDR_RESUME),
map->pfow_base + PFOW_COMMAND_CODE); map->pfow_base + PFOW_COMMAND_CODE);
map_write(map, CMD(LPDDR_START_EXECUTION), map_write(map, CMD(LPDDR_START_EXECUTION),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment