Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: accel: adxl345: use HZ macro from units.h
Remove duplicated definition of NHZ_PER_HZ, because it's available in
the units.h as NANOHZ_PER_HZ.
Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220812165243.22177-4-ddrokosov@sberdevices.ru
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Dmitry Rokosov
and committed by
Jonathan Cameron
fe49ce7a
d2a4cbcb
+4
-3
+4
-3
drivers/iio/accel/adxl345_core.c
+4
-3
drivers/iio/accel/adxl345_core.c
···
10
10
#include <linux/module.h>
11
11
#include <linux/property.h>
12
12
#include <linux/regmap.h>
13
+
#include <linux/units.h>
13
14
14
15
#include <linux/iio/iio.h>
15
16
#include <linux/iio/sysfs.h>
···
33
32
34
33
#define ADXL345_BW_RATE GENMASK(3, 0)
35
34
#define ADXL345_BASE_RATE_NANO_HZ 97656250LL
36
-
#define NHZ_PER_HZ 1000000000LL
37
35
38
36
#define ADXL345_POWER_CTL_MEASURE BIT(3)
39
37
#define ADXL345_POWER_CTL_STANDBY 0x00
···
139
139
140
140
samp_freq_nhz = ADXL345_BASE_RATE_NANO_HZ <<
141
141
(regval & ADXL345_BW_RATE);
142
-
*val = div_s64_rem(samp_freq_nhz, NHZ_PER_HZ, val2);
142
+
*val = div_s64_rem(samp_freq_nhz, NANOHZ_PER_HZ, val2);
143
143
144
144
return IIO_VAL_INT_PLUS_NANO;
145
145
}
···
164
164
ADXL345_REG_OFS_AXIS(chan->address),
165
165
val / 4);
166
166
case IIO_CHAN_INFO_SAMP_FREQ:
167
-
n = div_s64(val * NHZ_PER_HZ + val2, ADXL345_BASE_RATE_NANO_HZ);
167
+
n = div_s64(val * NANOHZ_PER_HZ + val2,
168
+
ADXL345_BASE_RATE_NANO_HZ);
168
169
169
170
return regmap_update_bits(data->regmap, ADXL345_REG_BW_RATE,
170
171
ADXL345_BW_RATE,