Patchwork mtd: map: BUG() in non handled cases

login
register
mail settings
Submitter Dmitry Eremin-Solenikov
Date Jan. 31, 2013, 5:06 p.m.
Message ID <1359651994-27363-1-git-send-email-dmitry_eremin@mentor.com>
Download mbox | patch
Permalink /patch/217213/
State New
Headers show

Comments

Dmitry Eremin-Solenikov - Jan. 31, 2013, 5:06 p.m.
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>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
---
 include/linux/mtd/map.h |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
Artem Bityutskiy - Feb. 4, 2013, 10:32 a.m.
On Thu, 2013-01-31 at 21:06 +0400, Dmitry Eremin-Solenikov wrote:
> 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>

Pushed to l2-mtd.git, thanks!

Patch

diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index f6eb433..1d6ef97 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -328,7 +328,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;
@@ -342,6 +342,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;
 }
@@ -391,7 +393,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);
@@ -425,6 +427,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();
 }