From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <linux-hwmon@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <linux@roeck-us.net>, <jdelvare@suse.com>,
<ardeleanalex@gmail.com>, <Mark.Thoren@analog.com>,
Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH 2/3] docs: hwmon: (ltc2945): change type of val to ULL in ltc2945_val_to_reg()
Date: Fri, 6 Nov 2020 12:18:24 +0200 [thread overview]
Message-ID: <20201106101825.30960-2-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20201106101825.30960-1-alexandru.ardelean@analog.com>
In order to account for any potential overflows that could occur.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/hwmon/ltc2945.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/hwmon/ltc2945.c b/drivers/hwmon/ltc2945.c
index 1cea710df668..75d997d31e01 100644
--- a/drivers/hwmon/ltc2945.c
+++ b/drivers/hwmon/ltc2945.c
@@ -155,7 +155,7 @@ static long long ltc2945_reg_to_val(struct device *dev, u8 reg)
}
static int ltc2945_val_to_reg(struct device *dev, u8 reg,
- unsigned long val)
+ unsigned long long val)
{
struct ltc2945_state *st = dev_get_drvdata(dev);
struct regmap *regmap = st->regmap;
@@ -181,14 +181,14 @@ static int ltc2945_val_to_reg(struct device *dev, u8 reg,
return ret;
if (control & CONTROL_MULT_SELECT) {
/* 25 mV * 25 uV = 0.625 uV resolution. */
- val = DIV_ROUND_CLOSEST(val, 625);
+ val = DIV_ROUND_CLOSEST_ULL(val, 625);
} else {
/*
* 0.5 mV * 25 uV = 0.0125 uV resolution.
* Divide first to avoid overflow;
* accept loss of accuracy.
*/
- val = DIV_ROUND_CLOSEST(val, 25) * 2;
+ val = DIV_ROUND_CLOSEST_ULL(val, 25) * 2;
}
break;
case LTC2945_VIN_H:
@@ -197,7 +197,7 @@ static int ltc2945_val_to_reg(struct device *dev, u8 reg,
case LTC2945_MAX_VIN_THRES_H:
case LTC2945_MIN_VIN_THRES_H:
/* 25 mV resolution. */
- val /= 25;
+ val = div_u64(val, 25);
break;
case LTC2945_ADIN_H:
case LTC2945_MAX_ADIN_H:
@@ -219,7 +219,7 @@ static int ltc2945_val_to_reg(struct device *dev, u8 reg,
* dividing the reported current by the sense resistor value
* in mOhm.
*/
- val = DIV_ROUND_CLOSEST(val, 25);
+ val = DIV_ROUND_CLOSEST_ULL(val, 25);
break;
default:
return -EINVAL;
@@ -247,13 +247,13 @@ static ssize_t ltc2945_value_store(struct device *dev,
struct ltc2945_state *st = dev_get_drvdata(dev);
struct regmap *regmap = st->regmap;
u8 reg = attr->index;
- unsigned long val;
+ unsigned long long val;
u8 regbuf[3];
int num_regs;
int regval;
int ret;
- ret = kstrtoul(buf, 10, &val);
+ ret = kstrtoull(buf, 10, &val);
if (ret)
return ret;
--
2.27.0
next prev parent reply other threads:[~2020-11-06 10:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 10:18 [PATCH 1/3] hwmon: (ltc2945): wrap regmap into an ltc2945_state struct Alexandru Ardelean
2020-11-06 10:18 ` Alexandru Ardelean [this message]
2020-11-06 13:14 ` [PATCH 2/3] docs: hwmon: (ltc2945): change type of val to ULL in ltc2945_val_to_reg() Guenter Roeck
2020-11-09 6:38 ` Alexandru Ardelean
2020-11-06 10:18 ` [PATCH 3/3] hwmon: (ltc2945): add support for sense resistor Alexandru Ardelean
2020-11-06 13:17 ` Guenter Roeck
2020-11-09 6:41 ` Alexandru Ardelean
2020-11-09 14:42 ` Guenter Roeck
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=20201106101825.30960-2-alexandru.ardelean@analog.com \
--to=alexandru.ardelean@analog.com \
--cc=Mark.Thoren@analog.com \
--cc=ardeleanalex@gmail.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
/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;
as well as URLs for NNTP newsgroup(s).