Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/mtd/chips/cfi_cmdset_0001.c

+0 −1
Original line number Diff line number Diff line
@@ -994,7 +994,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad 


	switch(chip->oldstate) {

	case FL_ERASING:

		chip->state = chip->oldstate;

		/* What if one interleaved chip has finished and the

		   other hasn't? The old code would leave the finished

		   one in READY mode. That's bad, and caused -EROFS

drivers/mtd/chips/cfi_cmdset_0002.c

+0 −1
Original line number Diff line number Diff line
@@ -761,7 +761,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad 


	switch(chip->oldstate) {

	case FL_ERASING:

		chip->state = chip->oldstate;

		map_write(map, cfi->sector_erase_cmd, chip->in_progress_block_addr);

		chip->oldstate = FL_READY;

		chip->state = FL_ERASING;

drivers/mtd/lpddr/lpddr_cmds.c

+0 −1
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ static void put_chip(struct map_info *map, struct flchip *chip) 


	switch (chip->oldstate) {

	case FL_ERASING:

		chip->state = chip->oldstate;

		map_write(map, CMD(LPDDR_RESUME),

				map->pfow_base + PFOW_COMMAND_CODE);

		map_write(map, CMD(LPDDR_START_EXECUTION),