Module Name: src
Committed By: thorpej
Date: Thu Jan 2 16:24:51 UTC 2020
Modified Files:
src/sys/dev/i2c: ds1307.c
Log Message:
No need to use I2C_F_POLL here.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/i2c/ds1307.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/ds1307.c
diff -u src/sys/dev/i2c/ds1307.c:1.33 src/sys/dev/i2c/ds1307.c:1.34
--- src/sys/dev/i2c/ds1307.c:1.33 Sun Sep 29 05:35:29 2019
+++ src/sys/dev/i2c/ds1307.c Thu Jan 2 16:24:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307.c,v 1.33 2019/09/29 05:35:29 macallan Exp $ */
+/* $NetBSD: ds1307.c,v 1.34 2020/01/02 16:24:51 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.33 2019/09/29 05:35:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.34 2020/01/02 16:24:51 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -524,7 +524,7 @@ dsrtc_clock_read_ymdhms(struct dsrtc_sof
KASSERT(DSXXXX_RTC_SIZE >= dm->dm_rtc_size);
- if ((error = iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) != 0) {
+ if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"%s: failed to acquire I2C bus: %d\n",
__func__, error);
@@ -536,11 +536,11 @@ dsrtc_clock_read_ymdhms(struct dsrtc_sof
cmdbuf[0] = dm->dm_rtc_start + i;
error = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
- sc->sc_address, cmdbuf, 1, &bcd[i], 1, I2C_F_POLL);
+ sc->sc_address, cmdbuf, 1, &bcd[i], 1, 0);
}
/* Done with I2C */
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ iic_release_bus(sc->sc_tag, 0);
if (error != 0) {
aprint_error_dev(sc->sc_dev,
@@ -609,7 +609,7 @@ dsrtc_clock_write_ymdhms(struct dsrtc_so
if (dt->dt_year - offset >= 100)
bcd[DSXXXX_MONTH] |= DSXXXX_MONTH_CENTURY;
- if ((error = iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) != 0) {
+ if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"%s: failed to acquire I2C bus: %d\n",
__func__, error);
@@ -620,8 +620,8 @@ dsrtc_clock_write_ymdhms(struct dsrtc_so
cmdbuf[0] = dm->dm_ch_reg;
if ((error = iic_exec(sc->sc_tag, I2C_OP_READ, sc->sc_address,
- cmdbuf, 1, &cmdbuf[1], 1, I2C_F_POLL)) != 0) {
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ cmdbuf, 1, &cmdbuf[1], 1, 0)) != 0) {
+ iic_release_bus(sc->sc_tag, 0);
aprint_error_dev(sc->sc_dev,
"%s: failed to read Hold Clock: %d\n",
__func__, error);
@@ -634,8 +634,8 @@ dsrtc_clock_write_ymdhms(struct dsrtc_so
cmdbuf[1] |= dm->dm_ch_value;
if ((error = iic_exec(sc->sc_tag, I2C_OP_WRITE, sc->sc_address,
- cmdbuf, 1, &cmdbuf[1], 1, I2C_F_POLL)) != 0) {
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ cmdbuf, 1, &cmdbuf[1], 1, 0)) != 0) {
+ iic_release_bus(sc->sc_tag, 0);
aprint_error_dev(sc->sc_dev,
"%s: failed to write Hold Clock: %d\n",
__func__, error);
@@ -658,8 +658,8 @@ dsrtc_clock_write_ymdhms(struct dsrtc_so
bcd[i] |= dm->dm_ch_value;
}
if ((error = iic_exec(sc->sc_tag, op, sc->sc_address,
- cmdbuf, 1, &bcd[i], 1, I2C_F_POLL)) != 0) {
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ cmdbuf, 1, &bcd[i], 1, 0)) != 0) {
+ iic_release_bus(sc->sc_tag, 0);
aprint_error_dev(sc->sc_dev,
"%s: failed to write rtc at 0x%x: %d\n",
__func__, i, error);
@@ -679,9 +679,8 @@ dsrtc_clock_write_ymdhms(struct dsrtc_so
cmdbuf[1] &= ~dm->dm_ch_value;
if ((error = iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP,
- sc->sc_address, cmdbuf, 1, &cmdbuf[1], 1,
- I2C_F_POLL)) != 0) {
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ sc->sc_address, cmdbuf, 1, &cmdbuf[1], 1, 0)) != 0) {
+ iic_release_bus(sc->sc_tag, 0);
aprint_error_dev(sc->sc_dev,
"%s: failed to Hold Clock: %d\n",
__func__, error);
@@ -689,7 +688,7 @@ dsrtc_clock_write_ymdhms(struct dsrtc_so
}
}
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ iic_release_bus(sc->sc_tag, 0);
return 1;
}
@@ -740,7 +739,7 @@ dsrtc_clock_read_timeval(struct dsrtc_so
uint8_t buf[4];
int error;
- if ((error = iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) != 0) {
+ if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"%s: failed to acquire I2C bus: %d\n",
__func__, error);
@@ -750,10 +749,10 @@ dsrtc_clock_read_timeval(struct dsrtc_so
/* read all registers: */
uint8_t reg = dm->dm_rtc_start;
error = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_address,
- ®, 1, buf, 4, I2C_F_POLL);
+ ®, 1, buf, 4, 0);
/* Done with I2C */
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ iic_release_bus(sc->sc_tag, 0);
if (error != 0) {
aprint_error_dev(sc->sc_dev,
@@ -790,7 +789,7 @@ dsrtc_clock_write_timeval(struct dsrtc_s
buf[4] = (t >> 24) & 0xff;
buf[5] = 0;
- if ((error = iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) != 0) {
+ if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"%s: failed to acquire I2C bus: %d\n",
__func__, error);
@@ -798,10 +797,10 @@ dsrtc_clock_write_timeval(struct dsrtc_s
}
error = iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP, sc->sc_address,
- &buf, buflen, NULL, 0, I2C_F_POLL);
+ &buf, buflen, NULL, 0, 0);
/* Done with I2C */
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ iic_release_bus(sc->sc_tag, 0);
/* send data */
if (error != 0) {
@@ -824,7 +823,7 @@ dsrtc_read_temp(struct dsrtc_softc *sc,
if ((sc->sc_model.dm_flags & DSRTC_FLAG_TEMP) == 0)
return ENOTSUP;
- if ((error = iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) != 0) {
+ if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
aprint_error_dev(sc->sc_dev,
"%s: failed to acquire I2C bus: %d\n",
__func__, error);
@@ -833,10 +832,10 @@ dsrtc_read_temp(struct dsrtc_softc *sc,
/* read temperature registers: */
error = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_address,
- ®, 1, buf, 2, I2C_F_POLL);
+ ®, 1, buf, 2, 0);
/* Done with I2C */
- iic_release_bus(sc->sc_tag, I2C_F_POLL);
+ iic_release_bus(sc->sc_tag, 0);
if (error != 0) {
aprint_error_dev(sc->sc_dev,
