From: Dmitry Rokosov <DDRokosov@sberdevices.ru>
To: "akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"jic23@kernel.org" <jic23@kernel.org>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"andriy.shevchenko@linux.intel.com"
<andriy.shevchenko@linux.intel.com>,
"andy.shevchenko@gmail.com" <andy.shevchenko@gmail.com>,
"christophe.jaillet@wanadoo.fr" <christophe.jaillet@wanadoo.fr>,
"stano.jakubek@gmail.com" <stano.jakubek@gmail.com>,
"shawnguo@kernel.org" <shawnguo@kernel.org>,
"stephan@gerhold.net" <stephan@gerhold.net>,
"daniel.lezcano@linaro.org" <daniel.lezcano@linaro.org>,
"wsa@kernel.org" <wsa@kernel.org>,
"lars@metafoo.de" <lars@metafoo.de>,
"Michael.Hennerich@analog.com" <Michael.Hennerich@analog.com>,
"jbhayana@google.com" <jbhayana@google.com>,
"lucas.demarchi@intel.com" <lucas.demarchi@intel.com>,
"jani.nikula@intel.com" <jani.nikula@intel.com>,
"linus.walleij@linaro.org" <linus.walleij@linaro.org>
Cc: "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>,
kernel <kernel@sberdevices.ru>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Dmitry Rokosov <DDRokosov@sberdevices.ru>
Subject: [PATCH v5 3/7] iio: accel: adxl345: use HZ macro from units.h
Date: Fri, 12 Aug 2022 16:52:27 +0000 [thread overview]
Message-ID: <20220812165243.22177-4-ddrokosov@sberdevices.ru> (raw)
In-Reply-To: <20220812165243.22177-1-ddrokosov@sberdevices.ru>
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>
---
drivers/iio/accel/adxl345_core.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c
index 370bfec1275a..1919e0089c11 100644
--- a/drivers/iio/accel/adxl345_core.c
+++ b/drivers/iio/accel/adxl345_core.c
@@ -10,6 +10,7 @@
#include <linux/module.h>
#include <linux/property.h>
#include <linux/regmap.h>
+#include <linux/units.h>
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
@@ -32,7 +33,6 @@
#define ADXL345_BW_RATE GENMASK(3, 0)
#define ADXL345_BASE_RATE_NANO_HZ 97656250LL
-#define NHZ_PER_HZ 1000000000LL
#define ADXL345_POWER_CTL_MEASURE BIT(3)
#define ADXL345_POWER_CTL_STANDBY 0x00
@@ -139,7 +139,7 @@ static int adxl345_read_raw(struct iio_dev *indio_dev,
samp_freq_nhz = ADXL345_BASE_RATE_NANO_HZ <<
(regval & ADXL345_BW_RATE);
- *val = div_s64_rem(samp_freq_nhz, NHZ_PER_HZ, val2);
+ *val = div_s64_rem(samp_freq_nhz, NANOHZ_PER_HZ, val2);
return IIO_VAL_INT_PLUS_NANO;
}
@@ -164,7 +164,8 @@ static int adxl345_write_raw(struct iio_dev *indio_dev,
ADXL345_REG_OFS_AXIS(chan->address),
val / 4);
case IIO_CHAN_INFO_SAMP_FREQ:
- n = div_s64(val * NHZ_PER_HZ + val2, ADXL345_BASE_RATE_NANO_HZ);
+ n = div_s64(val * NANOHZ_PER_HZ + val2,
+ ADXL345_BASE_RATE_NANO_HZ);
return regmap_update_bits(data->regmap, ADXL345_REG_BW_RATE,
ADXL345_BW_RATE,
--
2.36.0
next prev parent reply other threads:[~2022-08-12 16:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 16:52 [PATCH v5 0/7] iio: accel: add MSA311 accelerometer driver Dmitry Rokosov
2022-08-12 16:52 ` [PATCH v5 1/7] lib/string_helpers: Add str_read_write() helper Dmitry Rokosov
2022-08-12 17:15 ` Dmitry Rokosov
2022-08-12 16:52 ` [PATCH v5 2/7] units: complement the set of Hz units Dmitry Rokosov
2022-08-28 15:55 ` Jonathan Cameron
2022-08-29 21:06 ` Andrew Morton
2022-08-29 21:07 ` Andrew Morton
2022-08-12 16:52 ` [PATCH v5 4/7] iio: common: scmi_sensors: use HZ macro from units.h Dmitry Rokosov
2022-08-12 16:52 ` Dmitry Rokosov [this message]
2022-08-12 16:52 ` [PATCH v5 5/7] dt-bindings: vendor-prefixes: add MEMSensing Microsystems Co., Ltd Dmitry Rokosov
2022-08-12 16:52 ` [PATCH v5 6/7] iio: add MEMSensing MSA311 3-axis accelerometer driver Dmitry Rokosov
2022-08-12 17:10 ` Dmitry Rokosov
2022-08-12 22:34 ` Andy Shevchenko
2022-08-14 16:26 ` Jonathan Cameron
2022-08-15 14:01 ` Dmitry Rokosov
2022-08-14 16:41 ` Jonathan Cameron
2022-08-12 16:52 ` [PATCH v5 7/7] dt-bindings: iio: accel: add dt-binding schema for msa311 accel driver Dmitry Rokosov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220812165243.22177-4-ddrokosov@sberdevices.ru \
--to=ddrokosov@sberdevices.ru \
--cc=Michael.Hennerich@analog.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=jani.nikula@intel.com \
--cc=jbhayana@google.com \
--cc=jic23@kernel.org \
--cc=kernel@sberdevices.ru \
--cc=lars@metafoo.de \
--cc=linus.walleij@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=stano.jakubek@gmail.com \
--cc=stephan@gerhold.net \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®