Skip to contentSkip to conversation

util_macros.h: Have array pointer point to array of constants

PATCH New Guenter Roeck 1 participant 1 message Apr 27, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 util_macros.h: Have array pointer point to array of constants

Using the new find_closest() macro can result in the following sparse warnings.

drivers/hwmon/lm85.c:194:16: warning:
incorrect type in initializer (different modifiers)
drivers/hwmon/lm85.c:194:16: expected int *__fc_a
drivers/hwmon/lm85.c:194:16: got int static const [toplevel] *<noident>
drivers/hwmon/lm85.c:210:16: warning:
incorrect type in initializer (different modifiers)
drivers/hwmon/lm85.c:210:16: expected int *__fc_a
drivers/hwmon/lm85.c:210:16: got int const *map

This is because the array passed to find_closest() will typically be declared as array of constants, but the macro declares a non-constant pointer to it.

Cc Andrew Morton <[email protected]>
Cc Bartosz Golaszewski <[email protected]>
---
 include/linux/util_macros.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/util_macros.h +1 -1
index d5f4fb69dba3..f9b2ce58039b 100644
@@ -5,7 +5,7 @@
 ({									\
 	typeof(as) __fc_i, __fc_as = (as) - 1;				\
 	typeof(x) __fc_x = (x);						\
-	typeof(*a) *__fc_a = (a);					\
+	typeof(*a) const *__fc_a = (a);					\
 	for (__fc_i = 0; __fc_i < __fc_as; __fc_i++) {			\
 		if (__fc_x op DIV_ROUND_CLOSEST(__fc_a[__fc_i] +	\
 						__fc_a[__fc_i + 1], 2))	\
Signature · 1 line
2.1.0