Module Name: src
Committed By: thorpej
Date: Thu Jan 2 17:26:37 UTC 2020
Modified Files:
src/sys/dev/i2c: s390.c
Log Message:
- No need to use I2C_F_POLL here.
- Correctly propagate errors up the stack.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/s390.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/s390.c
diff -u src/sys/dev/i2c/s390.c:1.4 src/sys/dev/i2c/s390.c:1.5
--- src/sys/dev/i2c/s390.c:1.4 Sat Jun 16 21:22:13 2018
+++ src/sys/dev/i2c/s390.c Thu Jan 2 17:26:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: s390.c,v 1.4 2018/06/16 21:22:13 thorpej Exp $ */
+/* $NetBSD: s390.c,v 1.5 2020/01/02 17:26:37 thorpej Exp $ */
/*-
* Copyright (c) 2011 Frank Wille.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s390.c,v 1.4 2018/06/16 21:22:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s390.c,v 1.5 2020/01/02 17:26:37 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,20 +93,20 @@ s390rtc_attach(device_t parent, device_t
sc->sc_dev = self;
/* Reset the chip and turn on 24h mode, after power-off or battery. */
- if (!s390rtc_read(sc, S390_STATUS1, reg, sizeof(reg)))
+ if (s390rtc_read(sc, S390_STATUS1, reg, sizeof(reg)))
return;
if (reg[0] & (S390_ST1_POC | S390_ST1_BLD)) {
reg[0] |= S390_ST1_24H | S390_ST1_RESET;
- if (!s390rtc_write(sc, S390_STATUS1, reg, sizeof(reg)))
+ if (s390rtc_write(sc, S390_STATUS1, reg, sizeof(reg)))
return;
}
/* Disable the test mode, when enabled. */
- if (!s390rtc_read(sc, S390_STATUS2, reg, sizeof(reg)))
+ if (s390rtc_read(sc, S390_STATUS2, reg, sizeof(reg)))
return;
if ((reg[0] & S390_ST2_TEST)) {
reg[0] &= ~S390_ST2_TEST;
- if (!s390rtc_write(sc, S390_STATUS2, reg, sizeof(reg)))
+ if (s390rtc_write(sc, S390_STATUS2, reg, sizeof(reg)))
return;
}
@@ -122,11 +122,12 @@ s390rtc_gettime(struct todr_chip_handle
{
struct s390rtc_softc *sc = ch->cookie;
struct clock_ymdhms dt;
+ int error;
memset(&dt, 0, sizeof(dt));
- if (!s390rtc_clock_read(sc, &dt))
- return -1;
+ if ((error = s390rtc_clock_read(sc, &dt)) != 0)
+ return error;
tv->tv_sec = clock_ymdhms_to_secs(&dt);
tv->tv_usec = 0;
@@ -139,11 +140,12 @@ s390rtc_settime(struct todr_chip_handle
{
struct s390rtc_softc *sc = ch->cookie;
struct clock_ymdhms dt;
+ int error;
clock_secs_to_ymdhms(tv->tv_sec, &dt);
- if (!s390rtc_clock_write(sc, &dt))
- return -1;
+ if ((error = s390rtc_clock_write(sc, &dt)) != 0)
+ return error;
return 0;
}
@@ -152,9 +154,11 @@ static int
s390rtc_clock_read(struct s390rtc_softc *sc, struct clock_ymdhms *dt)
{
uint8_t bcd[S390_RT1_NBYTES];
+ int error;
- if (!s390rtc_read(sc, S390_REALTIME1, bcd, S390_RT1_NBYTES))
- return 0;
+ if ((error = s390rtc_read(sc, S390_REALTIME1, bcd,
+ S390_RT1_NBYTES)) != 0)
+ return error;
/*
* Convert the register values into something useable.
@@ -166,7 +170,7 @@ s390rtc_clock_read(struct s390rtc_softc
dt->dt_mon = bcdtobin(bcd[S390_RT1_MONTH]);
dt->dt_year = bcdtobin(bcd[S390_RT1_YEAR]) + 2000;
- return 1;
+ return 0;
}
static int
@@ -192,56 +196,56 @@ s390rtc_clock_write(struct s390rtc_softc
static int
s390rtc_read(struct s390rtc_softc *sc, int reg, uint8_t *buf, size_t len)
{
- int i;
+ int i, error;
- if (iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) {
+ if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"%s: failed to acquire I2C bus\n", __func__);
- return 0;
+ return error;
}
- if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr + reg,
- NULL, 0, buf, len, I2C_F_POLL)) {
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ if ((error = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
+ sc->sc_addr + reg, NULL, 0, buf, len, 0)) != 0) {
+ iic_release_bus(sc->sc_tag, 0);
aprint_error_dev(sc->sc_dev,
"%s: failed to read reg%d\n", __func__, reg);
- return 0;
+ return error;
}
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ iic_release_bus(sc->sc_tag, 0);
/* this chip returns each byte in reverse order */
for (i = 0; i < len; i++)
buf[i] = bitreverse(buf[i]);
- return 1;
+ return 0;
}
static int
s390rtc_write(struct s390rtc_softc *sc, int reg, uint8_t *buf, size_t len)
{
- int i;
+ int i, error;
- if (iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) {
+ if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"%s: failed to acquire I2C bus\n", __func__);
- return 0;
+ return error;
}
/* this chip expects each byte in reverse order */
for (i = 0; i < len; i++)
buf[i] = bitreverse(buf[i]);
- if (iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP, sc->sc_addr + reg,
- NULL, 0, buf, len, I2C_F_POLL)) {
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ if ((error = iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP,
+ sc->sc_addr + reg, NULL, 0, buf, len, 0)) != 0) {
+ iic_release_bus(sc->sc_tag, 0);
aprint_error_dev(sc->sc_dev,
"%s: failed to write reg%d\n", __func__, reg);
- return 0;
+ return error;
}
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
- return 1;
+ iic_release_bus(sc->sc_tag, 0);
+ return 0;
}
static uint8_t
