diff --git a/sys/dev/sfxge/common/ef10_nvram.c b/sys/dev/sfxge/common/ef10_nvram.c
index 3fd0bce21bfc..4f1c2f11cdc9 100644
--- a/sys/dev/sfxge/common/ef10_nvram.c
+++ b/sys/dev/sfxge/common/ef10_nvram.c
@@ -903,6 +903,8 @@ ef10_nvram_buffer_find_end(
 	efx_rc_t rc;
 	uint32_t *segment_used;
 
+	_NOTE(ARGUNUSED(offset))
+
 	if ((rc = tlv_init_cursor_from_size(&cursor, (uint8_t *)bufferp,
 			buffer_size)) != 0) {
 		rc = EFAULT;
@@ -1078,6 +1080,8 @@ ef10_nvram_buffer_delete_item(
 	efx_rc_t rc;
 	tlv_cursor_t cursor;
 
+	_NOTE(ARGUNUSED(length, end))
+
 	if ((rc = tlv_init_cursor_at_offset(&cursor, (uint8_t *)bufferp,
 			buffer_size, offset)) != 0) {
 		goto fail1;
diff --git a/sys/dev/sfxge/common/ef10_rx.c b/sys/dev/sfxge/common/ef10_rx.c
index 6145c66650da..d190109893ca 100644
--- a/sys/dev/sfxge/common/ef10_rx.c
+++ b/sys/dev/sfxge/common/ef10_rx.c
@@ -601,6 +601,8 @@ ef10_rx_prefix_pktlen(
 	__in		uint8_t *buffer,
 	__out		uint16_t *lengthp)
 {
+	_NOTE(ARGUNUSED(enp))
+
 	/*
 	 * The RX pseudo-header contains the packet length, excluding the
 	 * pseudo-header. If the hardware receive datapath was operating in
@@ -619,6 +621,8 @@ ef10_rx_prefix_hash(
 	__in		efx_rx_hash_alg_t func,
 	__in		uint8_t *buffer)
 {
+	_NOTE(ARGUNUSED(enp))
+
 	switch (func) {
 	case EFX_RX_HASHALG_TOEPLITZ:
 		return (buffer[0] |
@@ -745,7 +749,7 @@ ef10_rx_qcreate(
 	efx_rc_t rc;
 	boolean_t disable_scatter;
 
-	_NOTE(ARGUNUSED(erp))
+	_NOTE(ARGUNUSED(id, erp))
 
 	EFX_STATIC_ASSERT(EFX_EV_RX_NLABELS == (1 << ESF_DZ_RX_QLABEL_WIDTH));
 	EFSYS_ASSERT3U(label, <, EFX_EV_RX_NLABELS);
diff --git a/sys/dev/sfxge/common/ef10_tx.c b/sys/dev/sfxge/common/ef10_tx.c
index 16008b870d91..da490e149bb2 100755
--- a/sys/dev/sfxge/common/ef10_tx.c
+++ b/sys/dev/sfxge/common/ef10_tx.c
@@ -195,6 +195,7 @@ ef10_tx_qcreate(
 	efx_qword_t desc;
 	efx_rc_t rc;
 
+	_NOTE(ARGUNUSED(id))
 
 	if ((rc = efx_mcdi_init_txq(enp, n, eep->ee_index, label, index, flags,
 	    esmp)) != 0)
diff --git a/sys/dev/sfxge/common/efx_ev.c b/sys/dev/sfxge/common/efx_ev.c
index 76a632c99adf..5e3bc40c16d8 100644
--- a/sys/dev/sfxge/common/efx_ev.c
+++ b/sys/dev/sfxge/common/efx_ev.c
@@ -1264,6 +1264,8 @@ siena_ev_qcreate(
 	efx_oword_t oword;
 	efx_rc_t rc;
 
+	_NOTE(ARGUNUSED(esmp))
+
 	EFX_STATIC_ASSERT(ISP2(EFX_EVQ_MAXNEVS));
 	EFX_STATIC_ASSERT(ISP2(EFX_EVQ_MINNEVS));
 
diff --git a/sys/dev/sfxge/common/efx_rx.c b/sys/dev/sfxge/common/efx_rx.c
index a58287f9a8d4..4a3b76e2a5e2 100644
--- a/sys/dev/sfxge/common/efx_rx.c
+++ b/sys/dev/sfxge/common/efx_rx.c
@@ -965,6 +965,8 @@ siena_rx_prefix_hash(
 	__in		efx_rx_hash_alg_t func,
 	__in		uint8_t *buffer)
 {
+	_NOTE(ARGUNUSED(enp))
+
 	switch (func) {
 	case EFX_RX_HASHALG_TOEPLITZ:
 		return ((buffer[12] << 24) |
@@ -988,6 +990,8 @@ siena_rx_prefix_pktlen(
 	__in		uint8_t *buffer,
 	__out		uint16_t *lengthp)
 {
+	_NOTE(ARGUNUSED(enp, buffer, lengthp))
+
 	/* Not supported by Falcon/Siena hardware */
 	EFSYS_ASSERT(0);
 	return (ENOTSUP);
@@ -1120,6 +1124,8 @@ siena_rx_qcreate(
 	boolean_t jumbo;
 	efx_rc_t rc;
 
+	_NOTE(ARGUNUSED(esmp))
+
 	EFX_STATIC_ASSERT(EFX_EV_RX_NLABELS ==
 	    (1 << FRF_AZ_RX_DESCQ_LABEL_WIDTH));
 	EFSYS_ASSERT3U(label, <, EFX_EV_RX_NLABELS);
diff --git a/sys/dev/sfxge/common/efx_tx.c b/sys/dev/sfxge/common/efx_tx.c
index efceded7f314..c270784eda75 100644
--- a/sys/dev/sfxge/common/efx_tx.c
+++ b/sys/dev/sfxge/common/efx_tx.c
@@ -901,6 +901,8 @@ siena_tx_qcreate(
 	uint32_t size;
 	efx_rc_t rc;
 
+	_NOTE(ARGUNUSED(esmp))
+
 	EFX_STATIC_ASSERT(EFX_EV_TX_NLABELS ==
 	    (1 << FRF_AZ_TX_DESCQ_LABEL_WIDTH));
 	EFSYS_ASSERT3U(label, <, EFX_EV_TX_NLABELS);
diff --git a/sys/dev/sfxge/common/hunt_phy.c b/sys/dev/sfxge/common/hunt_phy.c
index 69587d9f5aa8..63e601133f9f 100644
--- a/sys/dev/sfxge/common/hunt_phy.c
+++ b/sys/dev/sfxge/common/hunt_phy.c
@@ -92,6 +92,8 @@ hunt_bist_poll(
 	uint32_t result;
 	efx_rc_t rc;
 
+	_NOTE(ARGUNUSED(type))
+
 	(void) memset(payload, 0, sizeof (payload));
 	req.emr_cmd = MC_CMD_POLL_BIST;
 	req.emr_in_buf = payload;
diff --git a/sys/dev/sfxge/common/siena_mcdi.c b/sys/dev/sfxge/common/siena_mcdi.c
index 2d679f66a9c0..babc11e0dcb8 100644
--- a/sys/dev/sfxge/common/siena_mcdi.c
+++ b/sys/dev/sfxge/common/siena_mcdi.c
@@ -174,6 +174,8 @@ siena_mcdi_init(
 	unsigned int portnum;
 	efx_rc_t rc;
 
+	_NOTE(ARGUNUSED(mtp))
+
 	EFSYS_ASSERT(enp->en_family == EFX_FAMILY_SIENA);
 
 	/* Determine the port number to use for MCDI */
@@ -212,6 +214,7 @@ fail1:
 siena_mcdi_fini(
 	__in		efx_nic_t *enp)
 {
+	_NOTE(ARGUNUSED(enp))
 }
 
 	__checkReturn	efx_rc_t