CVS commit: src/sys/dev

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Mon Jan 17 19:36:54 UTC 2022

Modified Files:
        src/sys/dev/i2c: mcp23xxxgpio_i2c.c
        src/sys/dev/ic: mcp23xxxgpiovar.h
        src/sys/dev/spi: mcp23xxxgpio_spi.c

Log Message:
G/C mcpgpio_softc::sc_phandle; nothing is using it.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/mcp23xxxgpio_i2c.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/mcp23xxxgpiovar.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/spi/mcp23xxxgpio_spi.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/mcp23xxxgpio_i2c.c
diff -u src/sys/dev/i2c/mcp23xxxgpio_i2c.c:1.1 src/sys/dev/i2c/mcp23xxxgpio_i2c.c:1.2
--- src/sys/dev/i2c/mcp23xxxgpio_i2c.c:1.1	Mon Jan 17 16:31:23 2022
+++ src/sys/dev/i2c/mcp23xxxgpio_i2c.c	Mon Jan 17 19:36:54 2022
@@ -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 <sys/cdefs.h>
-__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, devi
 	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");	

Index: src/sys/dev/ic/mcp23xxxgpiovar.h
diff -u src/sys/dev/ic/mcp23xxxgpiovar.h:1.1 src/sys/dev/ic/mcp23xxxgpiovar.h:1.2
--- src/sys/dev/ic/mcp23xxxgpiovar.h:1.1	Mon Jan 17 16:31:23 2022
+++ src/sys/dev/ic/mcp23xxxgpiovar.h	Mon Jan 17 19:36:54 2022
@@ -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. */

Index: src/sys/dev/spi/mcp23xxxgpio_spi.c
diff -u src/sys/dev/spi/mcp23xxxgpio_spi.c:1.1 src/sys/dev/spi/mcp23xxxgpio_spi.c:1.2
--- src/sys/dev/spi/mcp23xxxgpio_spi.c:1.1	Mon Jan 17 16:31:23 2022
+++ src/sys/dev/spi/mcp23xxxgpio_spi.c	Mon Jan 17 19:36:54 2022
@@ -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 <sys/cdefs.h>
-__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, devi
 	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");