aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Malaterre <[email protected]>2019-01-24 19:06:24 +0100
committerMark Brown <[email protected]>2019-01-29 15:23:56 +0000
commit435bba0f11f06789be59757719c161915e92f889 (patch)
tree1c774166338d3d5b75c3faca5382863232954ea1
parentbfeffd155283772bbe78c6a05dec7c0128ee500c (diff)
regmap: Remove attribute packed from struct 'regcache_rbtree_node'
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 <[email protected]> Cc: David Woodhouse <[email protected]> Signed-off-by: Mathieu Malaterre <[email protected]> Signed-off-by: Mark Brown <[email protected]>
-rw-r--r--drivers/base/regmap/regcache-rbtree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 2e8f0144f9ab..9cbb4b0cd01b 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -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;