Date: Tue, 10 May 2016 07:09:18 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299325 - head/sys/dev/sfxge/common Message-ID: <201605100709.u4A79ILL014486@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Tue May 10 07:09:18 2016 New Revision: 299325 URL: https://svnweb.freebsd.org/changeset/base/299325 Log: sfxge(4): remove EFSYS_OPT_MON_MAX6647 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:08:40 2016 (r299324) +++ head/sys/dev/sfxge/common/efx_check.h Tue May 10 07:09:18 2016 (r299325) @@ -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_MAX6647 (0) #define EFSYS_OPT_MON_NULL (0) #define EFSYS_OPT_NVRAM_FALCON_BOOTROM (0) @@ -167,12 +166,9 @@ # error "MON_LM87 is obsolete and is not supported." #endif -/* Support MAX6647 monitor */ -#if EFSYS_OPT_MON_MAX6647 -# if !EFSYS_OPT_FALCON -# error "MON_MAX6647 requires FALCON" -# endif -#endif /* EFSYS_OPT_MON_MAX6647 */ +#ifdef EFSYS_OPT_MON_MAX6647 +# error "MON_MAX6647 is obsolete and is not supported." +#endif /* Support null monitor */ #if EFSYS_OPT_MON_NULL Modified: head/sys/dev/sfxge/common/efx_mon.c ============================================================================== --- head/sys/dev/sfxge/common/efx_mon.c Tue May 10 07:08:40 2016 (r299324) +++ head/sys/dev/sfxge/common/efx_mon.c Tue May 10 07:09:18 2016 (r299325) @@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$"); #include "nullmon.h" #endif -#if EFSYS_OPT_MON_MAX6647 -#include "max6647.h" -#endif - #if EFSYS_OPT_MON_MCDI #include "mcdi_mon.h" #endif @@ -83,16 +79,6 @@ static efx_mon_ops_t __efx_mon_null_ops }; #endif -#if EFSYS_OPT_MON_MAX6647 -static efx_mon_ops_t __efx_mon_max6647_ops = { - max6647_reset, /* emo_reset */ - max6647_reconfigure, /* emo_reconfigure */ -#if EFSYS_OPT_MON_STATS - max6647_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 */ @@ -132,11 +118,6 @@ efx_mon_init( emop = &__efx_mon_null_ops; break; #endif -#if EFSYS_OPT_MON_MAX6647 - case EFX_MON_MAX6647: - emop = &__efx_mon_max6647_ops; - break; -#endif #if EFSYS_OPT_MON_MCDI case EFX_MON_SFC90X0: case EFX_MON_SFC91X0:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605100709.u4A79ILL014486>