Commit bbabf919 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron

iio: light: tsl2563: Drop unused defintion(s)

The CALIB_FRAC() is defined and might had been used in
tsl2563_calib_from_sysfs(). But let's just move a comment
from it to the latter function.

CLAIB_FRAC_HALF is used in a single place, i.e. in
tsl2563_calib_to_sysfs(). So, let's just inline it there.

While at it, switch to use DIV_ROUND_CLOSEST().
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarFerry Toth <ftoth@exalondelft.nl>
Link: https://lore.kernel.org/r/20221207190348.9347-5-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent b90619c4
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/math.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pm.h> #include <linux/pm.h>
...@@ -38,10 +39,6 @@ ...@@ -38,10 +39,6 @@
/* Bits used for fraction in calibration coefficients.*/ /* Bits used for fraction in calibration coefficients.*/
#define CALIB_FRAC_BITS 10 #define CALIB_FRAC_BITS 10
/* 0.5 in CALIB_FRAC_BITS precision */
#define CALIB_FRAC_HALF BIT(CALIB_FRAC_BITS - 1)
/* Make a fraction from a number n that was multiplied with b. */
#define CALIB_FRAC(n, b) (((n) << CALIB_FRAC_BITS) / (b))
/* Decimal 10^(digits in sysfs presentation) */ /* Decimal 10^(digits in sysfs presentation) */
#define CALIB_BASE_SYSFS 1000 #define CALIB_BASE_SYSFS 1000
...@@ -360,12 +357,12 @@ static int tsl2563_get_adc(struct tsl2563_chip *chip) ...@@ -360,12 +357,12 @@ static int tsl2563_get_adc(struct tsl2563_chip *chip)
static inline int tsl2563_calib_to_sysfs(u32 calib) static inline int tsl2563_calib_to_sysfs(u32 calib)
{ {
return (int) (((calib * CALIB_BASE_SYSFS) + return (int)DIV_ROUND_CLOSEST(calib * CALIB_BASE_SYSFS, BIT(CALIB_FRAC_BITS));
CALIB_FRAC_HALF) >> CALIB_FRAC_BITS);
} }
static inline u32 tsl2563_calib_from_sysfs(int value) static inline u32 tsl2563_calib_from_sysfs(int value)
{ {
/* Make a fraction from a number n that was multiplied with b. */
return (((u32) value) << CALIB_FRAC_BITS) / CALIB_BASE_SYSFS; return (((u32) value) << CALIB_FRAC_BITS) / CALIB_BASE_SYSFS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment