Module Name: src
Committed By: thorpej
Date: Mon Dec 23 18:12:50 UTC 2019
Modified Files:
src/sys/dev/i2c: ddc.c
Log Message:
No need to use I2C_F_POLL here.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/i2c/ddc.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/ddc.c
diff -u src/sys/dev/i2c/ddc.c:1.8 src/sys/dev/i2c/ddc.c:1.9
--- src/sys/dev/i2c/ddc.c:1.8 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/i2c/ddc.c Mon Dec 23 18:12:50 2019
@@ -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 @@ ddc_read_edid_block(i2c_tag_t tag, uint8
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));
