Skip to content

Commit

Permalink
mtd: map: BUG() in non handled cases
Browse files Browse the repository at this point in the history
Several map-related functions look like a serie of ifs, checking
widths of map. Those functions do not have any handling for default
case. Instead of fiddling with uninitialized_var in those functions,
let's just add a (correct) BUG() to the default case on those maps. This
will also allow us to catch potential errors in maps setup in future.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Feb 22, 2013
1 parent be0638d commit 24dea0c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions include/linux/mtd/map.h
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ static inline int map_word_bitsset(struct map_info *map, map_word val1, map_word

static inline map_word map_word_load(struct map_info *map, const void *ptr)
{
map_word r = {{0} };
map_word r;

if (map_bankwidth_is_1(map))
r.x[0] = *(unsigned char *)ptr;
Expand All @@ -343,6 +343,8 @@ static inline map_word map_word_load(struct map_info *map, const void *ptr)
#endif
else if (map_bankwidth_is_large(map))
memcpy(r.x, ptr, map->bankwidth);
else
BUG();

return r;
}
Expand Down Expand Up @@ -392,7 +394,7 @@ static inline map_word map_word_ff(struct map_info *map)

static inline map_word inline_map_read(struct map_info *map, unsigned long ofs)
{
map_word uninitialized_var(r);
map_word r;

if (map_bankwidth_is_1(map))
r.x[0] = __raw_readb(map->virt + ofs);
Expand Down Expand Up @@ -426,6 +428,8 @@ static inline void inline_map_write(struct map_info *map, const map_word datum,
#endif
else if (map_bankwidth_is_large(map))
memcpy_toio(map->virt+ofs, datum.x, map->bankwidth);
else
BUG();
mb();
}

Expand Down

0 comments on commit 24dea0c

Please sign in to comment.