Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5c8d2607756a63ddf5b2f2dd368851b8febe4e72

Authored by Tadashi Abe
Committed by David Woodhouse
1 parent 100f2341e3
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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: Tadashi Abe <tabe@mvista.com>
Acked-by: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Showing 3 changed files with 0 additions and 3 deletions Side-by-side Diff

drivers/mtd/chips/cfi_cmdset_0001.c
Diff comments   View file @ 5c8d260
... ... @@ -994,7 +994,6 @@
994 994  
995 995 switch(chip->oldstate) {
996 996 case FL_ERASING:
997   - chip->state = chip->oldstate;
998 997 /* What if one interleaved chip has finished and the
999 998 other hasn't? The old code would leave the finished
1000 999 one in READY mode. That's bad, and caused -EROFS
drivers/mtd/chips/cfi_cmdset_0002.c
Diff comments   View file @ 5c8d260
... ... @@ -761,7 +761,6 @@
761 761  
762 762 switch(chip->oldstate) {
763 763 case FL_ERASING:
764   - chip->state = chip->oldstate;
765 764 map_write(map, cfi->sector_erase_cmd, chip->in_progress_block_addr);
766 765 chip->oldstate = FL_READY;
767 766 chip->state = FL_ERASING;
drivers/mtd/lpddr/lpddr_cmds.c
Diff comments   View file @ 5c8d260
... ... @@ -378,7 +378,6 @@
378 378  
379 379 switch (chip->oldstate) {
380 380 case FL_ERASING:
381   - chip->state = chip->oldstate;
382 381 map_write(map, CMD(LPDDR_RESUME),
383 382 map->pfow_base + PFOW_COMMAND_CODE);
384 383 map_write(map, CMD(LPDDR_START_EXECUTION),