[src/trunk]: src/sys/dev/i2c No need to use I2C_F_POLL here.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a47b8f478449
branches:  trunk
changeset: 466498:a47b8f478449
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Dec 23 18:09:05 2019 +0000

description:
No need to use I2C_F_POLL here.

diffstat:

 sys/dev/i2c/cx24227.c |  16 ++++++++--------
 sys/dev/i2c/ddc.c     |  12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diffs (95 lines):

diff -r 3514e3720e5a -r a47b8f478449 sys/dev/i2c/cx24227.c
--- a/sys/dev/i2c/cx24227.c     Mon Dec 23 18:03:14 2019 +0000
+++ b/sys/dev/i2c/cx24227.c     Mon Dec 23 18:09:05 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cx24227.c,v 1.9 2019/12/23 18:03:14 thorpej Exp $ */
+/* $NetBSD: cx24227.c,v 1.10 2019/12/23 18:09:05 thorpej Exp $ */
 
 /*
  * Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cx24227.c,v 1.9 2019/12/23 18:03:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cx24227.c,v 1.10 2019/12/23 18:09:05 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -108,16 +108,16 @@
        int error;
        uint8_t r[3];
 
-       if ((error = iic_acquire_bus(sc->tag, I2C_F_POLL) != 0))
+       if ((error = iic_acquire_bus(sc->tag, 0) != 0))
                return error;
 
        r[0] = reg;
        r[1] = (data >> 8) & 0xff;
        r[2] = data & 0xff;
        error = iic_exec(sc->tag, I2C_OP_WRITE_WITH_STOP, sc->addr,
-           r, 3, NULL, 0, I2C_F_POLL);
+           r, 3, NULL, 0, 0);
        
-       iic_release_bus(sc->tag, I2C_F_POLL);
+       iic_release_bus(sc->tag, 0);
 
        return error;
 }
@@ -130,13 +130,13 @@
 
        *data = 0x0000;
 
-       if ((error = iic_acquire_bus(sc->tag, I2C_F_POLL) != 0))
+       if ((error = iic_acquire_bus(sc->tag, 0) != 0))
                return error;
 
        error = iic_exec(sc->tag, I2C_OP_READ_WITH_STOP, sc->addr,
-                        &reg, 1, r, 2, I2C_F_POLL);
+                        &reg, 1, r, 2, 0);
 
-       iic_release_bus(sc->tag, I2C_F_POLL);
+       iic_release_bus(sc->tag, 0);
 
        *data |= r[0] << 8;
        *data |= r[1];
diff -r 3514e3720e5a -r a47b8f478449 sys/dev/i2c/ddc.c
--- a/sys/dev/i2c/ddc.c Mon Dec 23 18:03:14 2019 +0000
+++ b/sys/dev/i2c/ddc.c Mon Dec 23 18:09:05 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ddc.c,v 1.8 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: ddc.c,v 1.9 2019/12/23 18:12:50 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddc.c,v 1.8 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddc.c,v 1.9 2019/12/23 18:12:50 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -102,17 +102,17 @@
        uint8_t wbuf[2];
        int error;
 
-       if ((error = iic_acquire_bus(tag, I2C_F_POLL)) != 0)
+       if ((error = iic_acquire_bus(tag, 0)) != 0)
                return error;
 
        wbuf[0] = block >> 1;   /* start address */
 
        if ((error = iic_exec(tag, I2C_OP_READ_WITH_STOP, DDC_ADDR, wbuf, 1,
-               edid, sizeof(edid), I2C_F_POLL)) != 0) {
-               iic_release_bus(tag, I2C_F_POLL);
+               edid, sizeof(edid), 0)) != 0) {
+               iic_release_bus(tag, 0);
                return error;
        }
-       iic_release_bus(tag, I2C_F_POLL);
+       iic_release_bus(tag, 0);
 
        if (block & 1) {
                memcpy(dest, &edid[128], uimin(len, 128));