CVS commit: src/sys/dev/usb

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Tue Mar 25 20:38:54 UTC 2025

Modified Files:
        src/sys/dev/usb: umcpmio.c

Log Message:
umcpmio(4): Omit needless boolean `takemutex' parameter.

This is generally a questionable pattern and it's wholly unnecessary
here.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/umcpmio.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/usb/umcpmio.c
diff -u src/sys/dev/usb/umcpmio.c:1.3 src/sys/dev/usb/umcpmio.c:1.4
--- src/sys/dev/usb/umcpmio.c:1.3	Tue Mar 25 20:38:27 2025
+++ src/sys/dev/usb/umcpmio.c	Tue Mar 25 20:38:54 2025
@@ -1,4 +1,4 @@
-/*	$NetBSD: umcpmio.c,v 1.3 2025/03/25 20:38:27 riastradh Exp $	*/
+/*	$NetBSD: umcpmio.c,v 1.4 2025/03/25 20:38:54 riastradh Exp $	*/
 
 /*
  * Copyright (c) 2024 Brad Spencer <b...@anduin.eldar.org>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umcpmio.c,v 1.3 2025/03/25 20:38:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcpmio.c,v 1.4 2025/03/25 20:38:54 riastradh Exp $");
 
 /*
  * Driver for the Microchip MCP2221 / MCP2221A USB multi-io chip
@@ -348,7 +348,7 @@ umcpmio_gpio_pin_write(void *arg, int pi
  */
 
 static int
-umcpmio_gpio_pin_ctlctl(void *arg, int pin, int flags, bool takemutex)
+umcpmio_gpio_pin_ctlctl(void *arg, int pin, int flags)
 {
 	struct umcpmio_softc *sc = arg;
 	struct mcp2221_set_sram_req set_sram_req;
@@ -360,8 +360,7 @@ umcpmio_gpio_pin_ctlctl(void *arg, int p
 	if (sc->sc_dying)
 		return 0;
 
-	if (takemutex)
-		mutex_enter(&sc->sc_action_mutex);
+	KASSERT(mutex_owned(&sc->sc_action_mutex));
 
 	err = umcpmio_get_sram(sc, &current_sram_res, false);
 	if (err)
@@ -475,9 +474,6 @@ umcpmio_gpio_pin_ctlctl(void *arg, int p
 	err = 0;
 
  out:
-	if (takemutex)
-		mutex_exit(&sc->sc_action_mutex);
-
 	return err;
 }
 
@@ -489,7 +485,9 @@ umcpmio_gpio_pin_ctl(void *arg, int pin,
 	if (sc->sc_dying)
 		return;
 
-	umcpmio_gpio_pin_ctlctl(sc, pin, flags, true);
+	mutex_enter(&sc->sc_action_mutex);
+	umcpmio_gpio_pin_ctlctl(sc, pin, flags);
+	mutex_exit(&sc->sc_action_mutex);
 }
 
 /*
@@ -1177,13 +1175,13 @@ umcpmio_dev_open(dev_t dev, int flags, i
 		 */
 		if (flags & FREAD) {
 			error = umcpmio_gpio_pin_ctlctl(sc, pin,
-			    GPIO_PIN_ALT0, false);
+			    GPIO_PIN_ALT0);
 		} else {
 			if (pin == 1) {
 				error = EINVAL;
 			} else {
 				error = umcpmio_gpio_pin_ctlctl(sc,
-				    pin, GPIO_PIN_ALT1, false);
+				    pin, GPIO_PIN_ALT1);
 			}
 		}
 	}
@@ -1334,8 +1332,7 @@ umcpmio_dev_close(dev_t dev, int flags, 
 		 * maybe the gpio config and save out what the
 		 * pin was set to.
 		 */
-		error = umcpmio_gpio_pin_ctlctl(sc, pin,
-		    GPIO_PIN_INPUT, false);
+		error = umcpmio_gpio_pin_ctlctl(sc, pin, GPIO_PIN_INPUT);
 	}
 out:
 	sc->sc_dev_open[dunit] = false;