diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-01-12 17:30:25 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-01-12 17:30:25 +0000 |
| commit | 521f9e34766ca527fa339268f6a33b603dca4d50 (patch) | |
| tree | 7e16d35ccea4d75721ec9017f34df28ba3d36b4b /sys/dev | |
| parent | 7876d3f3c89d56dee275ec4b107457d6e6569412 (diff) | |
rename new i2c_attach_args fields to avoid conflict with cpp magic in
isavar.h (a few parts of the tree include both)
ok jcs
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/dwiic.c | 6 | ||||
| -rw-r--r-- | sys/dev/i2c/i2cvar.h | 6 | ||||
| -rw-r--r-- | sys/dev/i2c/ihidev.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/acpi/dwiic.c b/sys/dev/acpi/dwiic.c index 45591c84bbb..d8dce614459 100644 --- a/sys/dev/acpi/dwiic.c +++ b/sys/dev/acpi/dwiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwiic.c,v 1.1 2016/01/12 01:11:15 jcs Exp $ */ +/* $OpenBSD: dwiic.c,v 1.2 2016/01/12 17:30:24 deraadt Exp $ */ /* * Synopsys DesignWare I2C controller * @@ -548,8 +548,8 @@ dwiic_acpi_foundhid(struct aml_node *node, void *arg) return 0; } - ia.ia_irq = crs.irq_int; - ia.ia_irq_flags = crs.irq_flags; + ia.ia_int = crs.irq_int; + ia.ia_int_flags = crs.irq_flags; if (config_found(sc->sc_iic, &ia, dwiic_i2c_print)) return 0; diff --git a/sys/dev/i2c/i2cvar.h b/sys/dev/i2c/i2cvar.h index 86829b0af82..5a8e71d67bd 100644 --- a/sys/dev/i2c/i2cvar.h +++ b/sys/dev/i2c/i2cvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i2cvar.h,v 1.12 2016/01/12 01:11:15 jcs Exp $ */ +/* $OpenBSD: i2cvar.h,v 1.13 2016/01/12 17:30:23 deraadt Exp $ */ /* $NetBSD: i2cvar.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */ /* @@ -106,8 +106,8 @@ struct i2c_attach_args { i2c_tag_t ia_tag; /* our controller */ i2c_addr_t ia_addr; /* address of device */ int ia_size; /* size (for EEPROMs) */ - int ia_irq; /* IRQ */ - int ia_irq_flags; /* IRQ flags */ + int ia_int; /* IRQ */ + int ia_int_flags; /* IRQ flags */ char *ia_name; /* chip name */ void *ia_cookie; /* pass extra info from bus to dev */ }; diff --git a/sys/dev/i2c/ihidev.c b/sys/dev/i2c/ihidev.c index e86ab922bff..b594836d86a 100644 --- a/sys/dev/i2c/ihidev.c +++ b/sys/dev/i2c/ihidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ihidev.c,v 1.1 2016/01/12 01:11:15 jcs Exp $ */ +/* $OpenBSD: ihidev.c,v 1.2 2016/01/12 17:30:23 deraadt Exp $ */ /* * HID-over-i2c driver * @@ -118,7 +118,7 @@ ihidev_attach(struct device *parent, struct device *self, void *aux) sc->sc_tag = ia->ia_tag; sc->sc_addr = ia->ia_addr; - printf(": int %d", ia->ia_irq); + printf(": int %d", ia->ia_int); if (ihidev_hid_command(sc, I2C_HID_CMD_DESCR, NULL) || ihidev_hid_desc_parse(sc)) { @@ -187,9 +187,9 @@ ihidev_attach(struct device *parent, struct device *self, void *aux) sc->sc_ibuf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK); /* register interrupt with system */ - if (ia->ia_irq > 0) { + if (ia->ia_int > 0) { /* XXX: don't assume this uses acpi_intr_establish */ - sc->sc_ih = acpi_intr_establish(ia->ia_irq, ia->ia_irq_flags, + sc->sc_ih = acpi_intr_establish(ia->ia_int, ia->ia_int_flags, IPL_BIO, ihidev_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(", failed establishing intr\n"); |