d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): remove EFSYS_OPT_MON_MAX6647

Browse Source 
Submitted by:   Andy Moreton <amoreton at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
MFC after:      1 week
This commit is contained in:
arybchik 2016-05-10 07:09:18 +00:00
parent 2dcc9c3fa8
commit b19950606a
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/sfxge/common/efx_check.h
View File

@ -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

19
sys/dev/sfxge/common/efx_mon.c
View File

@ -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: