sensors: lis2dh: compile lis2dh_reg_field_update() unconditionally

There is little reason to compile lis2dh_reg_field_update() function conditionally, based on enabled features. If it is not used, then linker will drop it anyway. Signed-off-by: Marcin Niestroj <[email protected]>
bseazeng · Nov 5, 2019 · d3f2878 · d3f2878
1 parent 320755b
commit d3f2878
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c
@@ -45,7 +45,6 @@ int lis2dh_spi_access(struct lis2dh_data *ctx, u8_t cmd,
 }
 #endif
 
-#if defined(CONFIG_LIS2DH_TRIGGER) || defined(CONFIG_LIS2DH_ACCEL_RANGE_RUNTIME)
 int lis2dh_reg_field_update(struct device *dev, u8_t reg_addr,
 			    u8_t pos, u8_t mask, u8_t val)
 {
@@ -63,7 +62,6 @@ int lis2dh_reg_field_update(struct device *dev, u8_t reg_addr,
 	return lis2dh_reg_write_byte(dev, reg_addr,
 				     (old_val & ~mask) | ((val << pos) & mask));
 }
-#endif
 
 static void lis2dh_convert(s16_t raw_val, u16_t scale,
 			   struct sensor_value *val)

diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h
@@ -349,16 +349,16 @@ static inline int lis2dh_reg_write_byte(struct device *dev, u8_t reg_addr,
 #endif
 }
 
+int lis2dh_reg_field_update(struct device *dev, u8_t reg_addr,
+			    u8_t pos, u8_t mask, u8_t val);
+
 #ifdef CONFIG_LIS2DH_TRIGGER
 int lis2dh_trigger_set(struct device *dev,
 		       const struct sensor_trigger *trig,
 		       sensor_trigger_handler_t handler);
 
 int lis2dh_init_interrupt(struct device *dev);
 
-int lis2dh_reg_field_update(struct device *dev, u8_t reg_addr,
-			    u8_t pos, u8_t mask, u8_t val);
-
 int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr,
 			    const struct sensor_value *val);
 #endif