* [PATCH] rtc: isl1208: fix negative digital trim reporting
@ 2019-01-02 16:00 Trent Piepho
2019-01-10 21:26 ` Alexandre Belloni
0 siblings, 1 reply; 2+ messages in thread
From: Trent Piepho @ 2019-01-02 16:00 UTC (permalink / raw)
To: linux-rtc; +Cc: Trent Piepho, Alessandro Zummo, Alexandre Belloni
isl1208_i2c_get_dtr() was returning the dtr value directly, but could
also return a negative error code. Negative trimming values, e.g. -20,
would get interpreted as an error code, e.g. -ENOTDIR.
This patch offsets the dtr value by 100 so it's positive and won't alias
an error code.
Also fix check that considered a return value of -1 to be success.
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Trent Piepho <tpiepho@impinj.com>
---
drivers/rtc/rtc-isl1208.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index 53e965888ead..320dd15331f4 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -200,6 +200,7 @@ isl1208_i2c_get_atr(struct i2c_client *client)
return atr;
}
+/* returns adjustment value + 100 */
static int
isl1208_i2c_get_dtr(struct i2c_client *client)
{
@@ -210,7 +211,7 @@ isl1208_i2c_get_dtr(struct i2c_client *client)
/* dtr encodes adjustments of {-60,-40,-20,0,20,40,60} ppm */
dtr = ((dtr & 0x3) * 20) * (dtr & (1 << 2) ? -1 : 1);
- return dtr;
+ return dtr + 100;
}
static int
@@ -287,8 +288,8 @@ isl1208_rtc_proc(struct device *dev, struct seq_file *seq)
(sr & ISL1208_REG_SR_RTCF) ? "bad" : "okay");
dtr = isl1208_i2c_get_dtr(client);
- if (dtr >= 0 - 1)
- seq_printf(seq, "digital_trim\t: %d ppm\n", dtr);
+ if (dtr >= 0)
+ seq_printf(seq, "digital_trim\t: %d ppm\n", dtr - 100);
atr = isl1208_i2c_get_atr(client);
if (atr >= 0)
@@ -677,7 +678,7 @@ isl1208_sysfs_show_dtrim(struct device *dev,
if (dtr < 0)
return dtr;
- return sprintf(buf, "%d ppm\n", dtr);
+ return sprintf(buf, "%d ppm\n", dtr - 100);
}
static DEVICE_ATTR(dtrim, S_IRUGO, isl1208_sysfs_show_dtrim, NULL);
--
2.14.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] rtc: isl1208: fix negative digital trim reporting
2019-01-02 16:00 [PATCH] rtc: isl1208: fix negative digital trim reporting Trent Piepho
@ 2019-01-10 21:26 ` Alexandre Belloni
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Belloni @ 2019-01-10 21:26 UTC (permalink / raw)
To: Trent Piepho; +Cc: linux-rtc, Alessandro Zummo
On 02/01/2019 16:00:17+0000, Trent Piepho wrote:
> isl1208_i2c_get_dtr() was returning the dtr value directly, but could
> also return a negative error code. Negative trimming values, e.g. -20,
> would get interpreted as an error code, e.g. -ENOTDIR.
>
> This patch offsets the dtr value by 100 so it's positive and won't alias
> an error code.
>
> Also fix check that considered a return value of -1 to be success.
>
> Cc: Alessandro Zummo <a.zummo@towertech.it>
> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Signed-off-by: Trent Piepho <tpiepho@impinj.com>
> ---
> drivers/rtc/rtc-isl1208.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
Applied, thanks.
It would be great if you could also implement .read_offset and
.set_offset instead of the custom dtrim attribute.
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-10 21:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-02 16:00 [PATCH] rtc: isl1208: fix negative digital trim reporting Trent Piepho
2019-01-10 21:26 ` Alexandre Belloni
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).