svn commit: r299326 - head/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Tue May 10 07:11:09 2016
New Revision: 299326
URL: https://svnweb.freebsd.org/changeset/base/299326

Log:
  sfxge(4): remove EFSYS_OPT_MON_NULL
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Modified:
  head/sys/dev/sfxge/common/efx_check.h
  head/sys/dev/sfxge/common/efx_mon.c

Modified: head/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:09:18 2016	(r299325)
+++ head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:11:09 2016	(r299326)
@@ -47,8 +47,6 @@
 # error "FALCON is obsolete and is not supported."
 #else
 /* FIXME: remove this after Falcon support has been removed */
-#define	EFSYS_OPT_MON_NULL			(0)
-
 #define	EFSYS_OPT_NVRAM_FALCON_BOOTROM		(0)
 #define	EFSYS_OPT_NVRAM_SFT9001			(0)
 #define	EFSYS_OPT_NVRAM_SFX7101			(0)
@@ -170,12 +168,9 @@
 # error "MON_MAX6647 is obsolete and is not supported."
 #endif
 
-/* Support null monitor */
-#if EFSYS_OPT_MON_NULL
-# if !EFSYS_OPT_FALCON
-#  error "MON_NULL requires FALCON"
-# endif
-#endif /* EFSYS_OPT_MON_NULL */
+#ifdef EFSYS_OPT_MON_NULL
+# error "MON_NULL is obsolete and is not supported."
+#endif
 
 /* Obsolete option */
 #ifdef EFSYS_OPT_MON_SIENA

Modified: head/sys/dev/sfxge/common/efx_mon.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_mon.c	Tue May 10 07:09:18 2016	(r299325)
+++ head/sys/dev/sfxge/common/efx_mon.c	Tue May 10 07:11:09 2016	(r299326)
@@ -34,10 +34,6 @@ __FBSDID("$FreeBSD$");
 #include "efx.h"
 #include "efx_impl.h"
 
-#if EFSYS_OPT_MON_NULL
-#include "nullmon.h"
-#endif
-
 #if EFSYS_OPT_MON_MCDI
 #include "mcdi_mon.h"
 #endif
@@ -69,16 +65,6 @@ efx_mon_name(
 
 #endif	/* EFSYS_OPT_NAMES */
 
-#if EFSYS_OPT_MON_NULL
-static efx_mon_ops_t	__efx_mon_null_ops = {
-	nullmon_reset,			/* emo_reset */
-	nullmon_reconfigure,		/* emo_reconfigure */
-#if EFSYS_OPT_MON_STATS
-	nullmon_stats_update		/* emo_stats_update */
-#endif	/* EFSYS_OPT_MON_STATS */
-};
-#endif
-
 #if EFSYS_OPT_MON_MCDI
 static efx_mon_ops_t	__efx_mon_mcdi_ops = {
 	NULL,				/* emo_reset */
@@ -113,11 +99,6 @@ efx_mon_init(
 
 	EFSYS_ASSERT(encp->enc_mon_type != EFX_MON_INVALID);
 	switch (emp->em_type) {
-#if EFSYS_OPT_MON_NULL
-	case EFX_MON_NULL:
-		emop = &__efx_mon_null_ops;
-		break;
-#endif
 #if EFSYS_OPT_MON_MCDI
 	case EFX_MON_SFC90X0:
 	case EFX_MON_SFC91X0: