Module Name: src
Committed By: thorpej
Date: Wed Jan 1 18:09:44 UTC 2020
Modified Files:
src/sys/dev/i2c: anxedp.c
Log Message:
No need to use I2C_F_POLL here.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/anxedp.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/anxedp.c
diff -u src/sys/dev/i2c/anxedp.c:1.2 src/sys/dev/i2c/anxedp.c:1.3
--- src/sys/dev/i2c/anxedp.c:1.2 Sun Feb 3 13:56:38 2019
+++ src/sys/dev/i2c/anxedp.c Wed Jan 1 18:09:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: anxedp.c,v 1.2 2019/02/03 13:56:38 jmcneill Exp $ */
+/* $NetBSD: anxedp.c,v 1.3 2020/01/01 18:09:44 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.2 2019/02/03 13:56:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.3 2020/01/01 18:09:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -99,7 +99,7 @@ anxedp_read(struct anxedp_softc *sc, u_i
{
uint8_t val;
- if (iic_smbus_read_byte(sc->sc_i2c, sc->sc_addr + off, reg, &val, I2C_F_POLL) != 0)
+ if (iic_smbus_read_byte(sc->sc_i2c, sc->sc_addr + off, reg, &val, 0) != 0)
val = 0xff;
return val;
@@ -108,7 +108,7 @@ anxedp_read(struct anxedp_softc *sc, u_i
static void
anxedp_write(struct anxedp_softc *sc, u_int off, uint8_t reg, uint8_t val)
{
- (void)iic_smbus_write_byte(sc->sc_i2c, sc->sc_addr + off, reg, val, I2C_F_POLL);
+ (void)iic_smbus_write_byte(sc->sc_i2c, sc->sc_addr + off, reg, val, 0);
}
static int
@@ -247,9 +247,9 @@ anxedp_connector_get_modes(struct drm_co
struct edid *pedid = NULL;
int error;
- iic_acquire_bus(sc->sc_i2c, I2C_F_POLL);
+ iic_acquire_bus(sc->sc_i2c, 0);
error = anxedp_read_edid(sc, edid, sizeof(edid));
- iic_release_bus(sc->sc_i2c, I2C_F_POLL);
+ iic_release_bus(sc->sc_i2c, 0);
if (error == 0)
pedid = (struct edid *)edid;
