diff --git a/sys/dev/i2c/mcp23xxxgpio_i2c.c b/sys/dev/i2c/mcp23xxxgpio_i2c.c index 3c479b98f8c2..41ac6a9edc7d 100644 --- a/sys/dev/i2c/mcp23xxxgpio_i2c.c +++ b/sys/dev/i2c/mcp23xxxgpio_i2c.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcp23xxxgpio_i2c.c,v 1.1 2022/01/17 16:31:23 thorpej Exp $ */ +/* $NetBSD: mcp23xxxgpio_i2c.c,v 1.2 2022/01/17 19:36:54 thorpej Exp $ */ /*- * Copyright (c) 2022 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mcp23xxxgpio_i2c.c,v 1.1 2022/01/17 16:31:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcp23xxxgpio_i2c.c,v 1.2 2022/01/17 19:36:54 thorpej Exp $"); /* * Driver for Microchip serial I/O expanders: @@ -163,7 +163,6 @@ mcpgpio_i2c_attach(device_t parent, device_t self, void *aux) sc->sc_dev = self; sc->sc_variant = dce->data; sc->sc_iocon = IOCON_SEQOP; - sc->sc_phandle = ia->ia_cookie; sc->sc_accessops = &mcpgpio_i2c_accessops; aprint_naive("\n"); diff --git a/sys/dev/ic/mcp23xxxgpiovar.h b/sys/dev/ic/mcp23xxxgpiovar.h index 78942a77785b..eeac984af457 100644 --- a/sys/dev/ic/mcp23xxxgpiovar.h +++ b/sys/dev/ic/mcp23xxxgpiovar.h @@ -1,4 +1,4 @@ -/* $NetBSD: mcp23xxxgpiovar.h,v 1.1 2022/01/17 16:31:23 thorpej Exp $ */ +/* $NetBSD: mcp23xxxgpiovar.h,v 1.2 2022/01/17 19:36:54 thorpej Exp $ */ /*- * Copyright (c) 2014, 2022 The NetBSD Foundation, Inc. @@ -78,7 +78,6 @@ struct mcpgpio_softc { struct gpio_chipset_tag sc_gpio_gc; gpio_pin_t *sc_gpio_pins; unsigned int sc_npins; - int sc_phandle; uint8_t sc_iocon; /* I/O configuration */ /* Bus-specific access functions. */ diff --git a/sys/dev/spi/mcp23xxxgpio_spi.c b/sys/dev/spi/mcp23xxxgpio_spi.c index 33c312ca2a4c..ab09d9e28e4d 100644 --- a/sys/dev/spi/mcp23xxxgpio_spi.c +++ b/sys/dev/spi/mcp23xxxgpio_spi.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcp23xxxgpio_spi.c,v 1.1 2022/01/17 16:31:23 thorpej Exp $ */ +/* $NetBSD: mcp23xxxgpio_spi.c,v 1.2 2022/01/17 19:36:54 thorpej Exp $ */ /*- * Copyright (c) 2014, 2022 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mcp23xxxgpio_spi.c,v 1.1 2022/01/17 16:31:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcp23xxxgpio_spi.c,v 1.2 2022/01/17 19:36:54 thorpej Exp $"); /* * Driver for Microchip serial I/O expanders: @@ -202,7 +202,6 @@ mcpgpio_spi_attach(device_t parent, device_t self, void *aux) sc->sc_variant = &mcp23s17; /* XXX */ sc->sc_iocon = IOCON_HAEN | IOCON_SEQOP; sc->sc_npins = MCP23x17_GPIO_NPINS; - sc->sc_phandle = -1; sc->sc_accessops = &mcpgpio_spi_accessops; aprint_naive("\n");