4 files changed, 14 insertions, 23 deletions
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3.h b/usr/src/uts/intel/io/vmxnet3s/vmxnet3.h
index 039c0f2e11..69a77afe34 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3.h
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3.h
@@ -202,13 +202,14 @@ extern int vmxnet3s_debug;
 #define	VMXNET3_DRIVER_VERSION_STRING	"1.1.0.0"
 
 /* Logging stuff */
-#define	VMXNET3_WARN(Device, ...) vmxnet3_log(CE_WARN, Device, __VA_ARGS__)
+#define	VMXNET3_WARN(Device, ...) \
+	dev_err((Device)->dip, CE_WARN, "!" __VA_ARGS__)
 
 #ifdef	DEBUG
-#define	VMXNET3_DEBUG(Device, Level, ...) {			\
-	if (Level <= vmxnet3s_debug) {				\
-		vmxnet3_log(CE_CONT, Device, "?" __VA_ARGS__);	\
-	}							\
+#define	VMXNET3_DEBUG(Device, Level, ...) {				\
+	if (Level <= vmxnet3s_debug) {					\
+		dev_err((Device)->dip, CE_CONT, "?" __VA_ARGS__);	\
+	}								\
 }
 #else
 #define	VMXNET3_DEBUG(Device, Level, ...)
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c
index 612dc052f1..86275f3fbd 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c
@@ -856,9 +856,8 @@ vmxnet3_get_prop(void *data, const char *prop_name, mac_prop_id_t prop_id,
 		bcopy(&dp->cur_mtu, prop_val, sizeof (uint32_t));
 		break;
 	default:
-		VMXNET3_WARN(dp, "vmxnet3_get_prop property %d not supported",
-		    prop_id);
 		ret = ENOTSUP;
+		break;
 	}
 	return (ret);
 }
@@ -880,9 +879,8 @@ vmxnet3_set_prop(void *data, const char *prop_name, mac_prop_id_t prop_id,
 		break;
 	}
 	default:
-		VMXNET3_WARN(dp, "vmxnet3_set_prop property %d not supported",
-		    prop_id);
 		ret = ENOTSUP;
+		break;
 	}
 
 	return (ret);
@@ -893,16 +891,13 @@ static void
 vmxnet3_prop_info(void *data, const char *prop_name, mac_prop_id_t prop_id,
     mac_prop_info_handle_t prop_handle)
 {
-	vmxnet3_softc_t *dp = data;
-
 	switch (prop_id) {
 	case MAC_PROP_MTU:
 		mac_prop_info_set_range_uint32(prop_handle, VMXNET3_MIN_MTU,
 		    VMXNET3_MAX_MTU);
 		break;
 	default:
-		VMXNET3_WARN(dp, "vmxnet3_prop_info: property %d not supported",
-		    prop_id);
+		break;
 	}
 }
 
@@ -1624,9 +1619,3 @@ _info(struct modinfo *modinfop)
 {
 	return (mod_info(&vmxnet3_modlinkage, modinfop));
 }
-
-void
-vmxnet3_log(int level, vmxnet3_softc_t *dp, char *fmt, ...)
-{
-	dev_err(dp->dip, level, fmt);
-}
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_rx.c b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_rx.c
index 0099464824..8004a3eb3e 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_rx.c
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_rx.c
@@ -394,8 +394,8 @@ vmxnet3_rx_intr(vmxnet3_softc_t *dp, vmxnet3_rxqueue_t *rxq)
 				mpTail = &mblk->b_cont;
 				ASSERT(*mpTail == NULL);
 
-				VMXNET3_DEBUG(dp, 3, "rx 0x%p on [%u]\n", mblk,
-				    rxdIdx);
+				VMXNET3_DEBUG(dp, 3, "rx 0x%p on [%u]\n",
+				    (void *)mblk, rxdIdx);
 
 				if (eop) {
 					if (!compDesc->rcd.err) {
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_tx.c b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_tx.c
index 4789bf55ef..8a9f05e690 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_tx.c
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_tx.c
@@ -293,7 +293,8 @@ vmxnet3_tx_one(vmxnet3_softc_t *dp, vmxnet3_txqueue_t *txq,
 		txqCtrl->txNumDeferred++;
 	}
 
-	VMXNET3_DEBUG(dp, 3, "tx 0x%p on [%u;%u]\n", mp, sopIdx, eopIdx);
+	VMXNET3_DEBUG(dp, 3, "tx 0x%p on [%u;%u]\n", (void *)mp, sopIdx,
+	    eopIdx);
 
 	goto done;
 
@@ -458,7 +459,7 @@ vmxnet3_tx_complete(vmxnet3_softc_t *dp, vmxnet3_txqueue_t *txq)
 
 		completedTx = B_TRUE;
 
-		VMXNET3_DEBUG(dp, 3, "cp 0x%p on [%u;%u]\n", mp, sopIdx,
+		VMXNET3_DEBUG(dp, 3, "cp 0x%p on [%u;%u]\n", (void *)mp, sopIdx,
 		    eopIdx);
 
 		VMXNET3_INC_RING_IDX(compRing, compRing->next2comp);