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

[Andrew Rybchenko]

Author: arybchik
Date: Tue May 10 07:08:40 2016
New Revision: 299324
URL: https://svnweb.freebsd.org/changeset/base/299324

Log:
  sfxge(4): remove EFSYS_OPT_MON_LM87
  
  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:07:49 2016	(r299323)
+++ head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:08:40 2016	(r299324)
@@ -47,7 +47,6 @@
 # error "FALCON is obsolete and is not supported."
 #else
 /* FIXME: remove this after Falcon support has been removed */
-#define	EFSYS_OPT_MON_LM87			(0)
 #define	EFSYS_OPT_MON_MAX6647			(0)
 #define	EFSYS_OPT_MON_NULL			(0)
 
@@ -164,12 +163,9 @@
 # endif
 #endif /* EFSYS_OPT_MCDI_PROXY_AUTH */
 
-/* Support LM87 monitor */
-#if EFSYS_OPT_MON_LM87
-# if !EFSYS_OPT_FALCON
-#  error "MON_LM87 requires FALCON"
-# endif
-#endif /* EFSYS_OPT_MON_LM87 */
+#ifdef EFSYS_OPT_MON_LM87
+# error "MON_LM87 is obsolete and is not supported."
+#endif
 
 /* Support MAX6647 monitor */
 #if EFSYS_OPT_MON_MAX6647

Modified: head/sys/dev/sfxge/common/efx_mon.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_mon.c	Tue May 10 07:07:49 2016	(r299323)
+++ head/sys/dev/sfxge/common/efx_mon.c	Tue May 10 07:08:40 2016	(r299324)
@@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$");
 #include "nullmon.h"
 #endif
 
-#if EFSYS_OPT_MON_LM87
-#include "lm87.h"
-#endif
-
 #if EFSYS_OPT_MON_MAX6647
 #include "max6647.h"
 #endif
@@ -87,16 +83,6 @@ static efx_mon_ops_t	__efx_mon_null_ops 
 };
 #endif
 
-#if EFSYS_OPT_MON_LM87
-static efx_mon_ops_t	__efx_mon_lm87_ops = {
-	lm87_reset,			/* emo_reset */
-	lm87_reconfigure,		/* emo_reconfigure */
-#if EFSYS_OPT_MON_STATS
-	lm87_stats_update		/* emo_stats_update */
-#endif	/* EFSYS_OPT_MON_STATS */
-};
-#endif
-
 #if EFSYS_OPT_MON_MAX6647
 static efx_mon_ops_t	__efx_mon_max6647_ops = {
 	max6647_reset,			/* emo_reset */
@@ -146,11 +132,6 @@ efx_mon_init(
 		emop = &__efx_mon_null_ops;
 		break;
 #endif
-#if EFSYS_OPT_MON_LM87
-	case EFX_MON_LM87:
-		emop = &__efx_mon_lm87_ops;
-		break;
-#endif
 #if EFSYS_OPT_MON_MAX6647
 	case EFX_MON_MAX6647:
 		emop = &__efx_mon_max6647_ops;