commit 6be490763d27ecfddde6dbdc16bace9bafedafc7
author Barret Rhoden <brho@cs.berkeley.edu> Wed Jan 21 16:49:50 2015 -0500
committer Barret Rhoden <brho@cs.berkeley.edu> Tue Feb 03 10:12:30 2015 -0500
tree 61fbedd62c8bb1a719591c0f7c2bf65a9b94a879
parent f4c76509ad0765e34efff57094e05d0cee01198c

BXE: mutex initialization

Dropping the extra arguments.  And spatch worked fine this time!  (With the
spatchme.sh script).

kern/drivers/net/bxe/bxe.c

diff --git a/kern/drivers/net/bxe/bxe.c b/kern/drivers/net/bxe/bxe.c
index d3b967f..b7d43f9 100644
--- a/kern/drivers/net/bxe/bxe.c
+++ b/kern/drivers/net/bxe/bxe.c
@@ -2555,7 +2555,6 @@
 static void
 bxe_init_mutexes(struct bxe_adapter *sc)
 {
-#if 0
 #ifdef BXE_CORE_LOCK_SX
     snprintf(sc->core_sx_name, sizeof(sc->core_sx_name),
              "bxe%d_core_lock", sc->unit);
@@ -2563,36 +2562,35 @@
 #else
     snprintf(sc->core_mtx_name, sizeof(sc->core_mtx_name),
              "bxe%d_core_lock", sc->unit);
-    mtx_init(&sc->core_mtx, sc->core_mtx_name, NULL, MTX_DEF);
+    qlock_init(&sc->core_mtx);
 
     snprintf(sc->sp_mtx_name, sizeof(sc->sp_mtx_name),
              "bxe%d_sp_lock", sc->unit);
-    mtx_init(&sc->sp_mtx, sc->sp_mtx_name, NULL, MTX_DEF);
+    qlock_init(&sc->sp_mtx);
 
     snprintf(sc->dmae_mtx_name, sizeof(sc->dmae_mtx_name),
              "bxe%d_dmae_lock", sc->unit);
-    mtx_init(&sc->dmae_mtx, sc->dmae_mtx_name, NULL, MTX_DEF);
+    qlock_init(&sc->dmae_mtx);
 
     snprintf(sc->port.phy_mtx_name, sizeof(sc->port.phy_mtx_name),
              "bxe%d_phy_lock", sc->unit);
-    mtx_init(&sc->port.phy_mtx, sc->port.phy_mtx_name, NULL, MTX_DEF);
+    qlock_init(&sc->port.phy_mtx);
 
     snprintf(sc->fwmb_mtx_name, sizeof(sc->fwmb_mtx_name),
              "bxe%d_fwmb_lock", sc->unit);
-    mtx_init(&sc->fwmb_mtx, sc->fwmb_mtx_name, NULL, MTX_DEF);
+    qlock_init(&sc->fwmb_mtx);
 
     snprintf(sc->print_mtx_name, sizeof(sc->print_mtx_name),
              "bxe%d_print_lock", sc->unit);
-    mtx_init(&(sc->print_mtx), sc->print_mtx_name, NULL, MTX_DEF);
+    qlock_init(&(sc->print_mtx));
 
     snprintf(sc->stats_mtx_name, sizeof(sc->stats_mtx_name),
              "bxe%d_stats_lock", sc->unit);
-    mtx_init(&(sc->stats_mtx), sc->stats_mtx_name, NULL, MTX_DEF);
+    qlock_init(&(sc->stats_mtx));
 
     snprintf(sc->mcast_mtx_name, sizeof(sc->mcast_mtx_name),
              "bxe%d_mcast_lock", sc->unit);
-    mtx_init(&(sc->mcast_mtx), sc->mcast_mtx_name, NULL, MTX_DEF);
-#endif
+    qlock_init(&(sc->mcast_mtx));
 #endif
 }
 
@@ -9926,11 +9924,11 @@
 
     snprintf(fp->tx_mtx_name, sizeof(fp->tx_mtx_name),
              "bxe%d_fp%d_tx_lock", sc->unit, idx);
-    //mtx_init(&fp->tx_mtx, fp->tx_mtx_name, NULL, MTX_DEF);
+    qlock_init(&fp->tx_mtx);
 
     snprintf(fp->rx_mtx_name, sizeof(fp->rx_mtx_name),
              "bxe%d_fp%d_rx_lock", sc->unit, idx);
-    //mtx_init(&fp->rx_mtx, fp->rx_mtx_name, NULL, MTX_DEF);
+    qlock_init(&fp->rx_mtx);
 
     fp->igu_sb_id = (sc->igu_base_sb + idx + CNIC_SUPPORT(sc));
     fp->fw_sb_id = (sc->base_fw_ndsb + idx + CNIC_SUPPORT(sc));

scripts/spatch/bsd/locks.cocci

diff --git a/scripts/spatch/bsd/locks.cocci b/scripts/spatch/bsd/locks.cocci
index 055246a..2458103 100644
--- a/scripts/spatch/bsd/locks.cocci
+++ b/scripts/spatch/bsd/locks.cocci
@@ -12,4 +12,11 @@
 -ECORE_MUTEX
 +qlock_t
 
-
+@@
+expression E1;
+expression E2;
+expression E3;
+expression E4;
+@@
+-mtx_init(E1, E2, E3, E4)
++qlock_init(E1)