Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Aug 2012 04:44:58 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r239351 - in head/sys: arm/xscale/ixp425 mips/atheros mips/cavium mips/rt305x
Message-ID:  <201208170444.q7H4iwrv018416@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rpaulo
Date: Fri Aug 17 04:44:57 2012
New Revision: 239351
URL: http://svn.freebsd.org/changeset/base/239351

Log:
  The GPIO drivers were initialising their mutexes with type of
  MTX_NETWORK_LOCK. This is wrong since these mutexes have nothing to do
  with networking.

Modified:
  head/sys/arm/xscale/ixp425/cambria_gpio.c
  head/sys/mips/atheros/ar71xx_gpio.c
  head/sys/mips/cavium/octeon_gpio.c
  head/sys/mips/rt305x/rt305x_gpio.c

Modified: head/sys/arm/xscale/ixp425/cambria_gpio.c
==============================================================================
--- head/sys/arm/xscale/ixp425/cambria_gpio.c	Fri Aug 17 03:10:48 2012	(r239350)
+++ head/sys/arm/xscale/ixp425/cambria_gpio.c	Fri Aug 17 04:44:57 2012	(r239351)
@@ -435,8 +435,7 @@ cambria_gpio_attach(device_t dev)
 	sc->sc_iot = ixp425_softc->sc_iot;
 	sc->sc_gpio_ioh = ixp425_softc->sc_gpio_ioh;
 
-	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
-	    MTX_DEF);
+	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
 
 	for (pin = 0; pin < GPIO_PINS; pin++) {
 		struct cambria_gpio_pin *p = &cambria_gpio_pins[pin];

Modified: head/sys/mips/atheros/ar71xx_gpio.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_gpio.c	Fri Aug 17 03:10:48 2012	(r239350)
+++ head/sys/mips/atheros/ar71xx_gpio.c	Fri Aug 17 04:44:57 2012	(r239351)
@@ -335,8 +335,7 @@ ar71xx_gpio_attach(device_t dev)
 	KASSERT((device_get_unit(dev) == 0),
 	    ("ar71xx_gpio: Only one gpio module supported"));
 
-	mtx_init(&sc->gpio_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
-	    MTX_DEF);
+	mtx_init(&sc->gpio_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
 
 	/* Map control/status registers. */
 	sc->gpio_mem_rid = 0;

Modified: head/sys/mips/cavium/octeon_gpio.c
==============================================================================
--- head/sys/mips/cavium/octeon_gpio.c	Fri Aug 17 03:10:48 2012	(r239350)
+++ head/sys/mips/cavium/octeon_gpio.c	Fri Aug 17 04:44:57 2012	(r239351)
@@ -383,8 +383,7 @@ octeon_gpio_attach(device_t dev)
 	KASSERT((device_get_unit(dev) == 0),
 	    ("octeon_gpio: Only one gpio module supported"));
 
-	mtx_init(&sc->gpio_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
-	    MTX_DEF);
+	mtx_init(&sc->gpio_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
 
 	for ( i = 0; i < OCTEON_GPIO_IRQS; i++) {
 		if ((sc->gpio_irq_res[i] = bus_alloc_resource(dev, 

Modified: head/sys/mips/rt305x/rt305x_gpio.c
==============================================================================
--- head/sys/mips/rt305x/rt305x_gpio.c	Fri Aug 17 03:10:48 2012	(r239350)
+++ head/sys/mips/rt305x/rt305x_gpio.c	Fri Aug 17 04:44:57 2012	(r239351)
@@ -447,8 +447,7 @@ rt305x_gpio_attach(device_t dev)
 	KASSERT((device_get_unit(dev) == 0),
 	    ("rt305x_gpio_gpio: Only one gpio module supported"));
 
-	mtx_init(&sc->gpio_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
-	    MTX_DEF);
+	mtx_init(&sc->gpio_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
 
 	/* Map control/status registers. */
 	sc->gpio_mem_rid = 0;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208170444.q7H4iwrv018416>