]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
regmap: Remove attribute packed from struct 'regcache_rbtree_node'
authorMathieu Malaterre <malat@debian.org>
Thu, 24 Jan 2019 18:06:24 +0000 (19:06 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 29 Jan 2019 15:23:56 +0000 (15:23 +0000)
On one hand commit 28644c809f44 ("regmap: Add the rbtree cache support")
added 'regcache_rbtree_node' as packed structure, while on the other hand
commit e977145aeaad ("[RBTREE] Add explicit alignment to sizeof(long)
for struct rb_node.") declared struct 'rb_node' as aligned.

Solve the ambiguity of placing aligned structure in a packed one by
removing the packed attribute from struct. This seems to be the behavior
of gcc anyway.

This removes the following warning (W=1):

  drivers/base/regmap/regcache-rbtree.c:36:1: warning: alignment 1 of 'struct regcache_rbtree_node' is less than 4 [-Wpacked-not-aligned]

Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/base/regmap/regcache-rbtree.c

index 2e8f0144f9ab3cb031983538aeb235ef984b70a3..9cbb4b0cd01bf3939760f42cc760e73c25a9028a 100644 (file)
@@ -33,7 +33,7 @@ struct regcache_rbtree_node {
        unsigned int blklen;
        /* the actual rbtree node holding this block */
        struct rb_node node;
-} __attribute__ ((packed));
+};
 
 struct regcache_rbtree_ctx {
        struct rb_root root;