From 4afb0149b18c575b88b291af15691545e3070769 Mon Sep 17 00:00:00 2001 From: arybchik Date: Tue, 10 May 2016 07:19:15 +0000 Subject: [PATCH] sfxge(4): remove EFSYS_OPT_PHY_SFT9001 Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. MFC after: 1 week --- sys/dev/sfxge/common/efx_check.h | 10 +++------- sys/dev/sfxge/common/efx_phy.c | 32 -------------------------------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/sys/dev/sfxge/common/efx_check.h b/sys/dev/sfxge/common/efx_check.h index b42230c42694..b3461c91efb7 100644 --- a/sys/dev/sfxge/common/efx_check.h +++ b/sys/dev/sfxge/common/efx_check.h @@ -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_PHY_SFT9001 (0) #define EFSYS_OPT_PHY_SFX7101 (0) #define EFSYS_OPT_PHY_TXC43128 (0) #endif @@ -264,12 +263,9 @@ # error "PHY_QT2025C is obsolete and is not supported." #endif -/* Support SFT9001 PHY (Starbolt NIC) */ -#if EFSYS_OPT_PHY_SFT9001 -# if !EFSYS_OPT_FALCON -# error "PHY_SFT9001 requires FALCON" -# endif -#endif /* EFSYS_OPT_PHY_SFT9001 */ +#ifdef EFSYS_OPT_PHY_SFT9001 +# error "PHY_SFT9001 is obsolete and is not supported." +#endif /* Support SFX7101 PHY (SFE4001 NIC) */ #if EFSYS_OPT_PHY_SFX7101 diff --git a/sys/dev/sfxge/common/efx_phy.c b/sys/dev/sfxge/common/efx_phy.c index d4d644fe3a9c..2155e7007aee 100644 --- a/sys/dev/sfxge/common/efx_phy.c +++ b/sys/dev/sfxge/common/efx_phy.c @@ -42,10 +42,6 @@ __FBSDID("$FreeBSD$"); #include "txc43128.h" #endif -#if EFSYS_OPT_PHY_SFT9001 -#include "sft9001.h" -#endif - #if EFSYS_OPT_PHY_SFX7101 static efx_phy_ops_t __efx_phy_sfx7101_ops = { sfx7101_power, /* epo_power */ @@ -102,34 +98,6 @@ static efx_phy_ops_t __efx_phy_txc43128_ops = { }; #endif /* EFSYS_OPT_PHY_TXC43128 */ -#if EFSYS_OPT_PHY_SFT9001 -static efx_phy_ops_t __efx_phy_sft9001_ops = { - NULL, /* epo_power */ - sft9001_reset, /* epo_reset */ - sft9001_reconfigure, /* epo_reconfigure */ - sft9001_verify, /* epo_verify */ - sft9001_uplink_check, /* epo_uplink_check */ - sft9001_downlink_check, /* epo_downlink_check */ - sft9001_oui_get, /* epo_oui_get */ -#if EFSYS_OPT_PHY_STATS - sft9001_stats_update, /* epo_stats_update */ -#endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS -#if EFSYS_OPT_NAMES - sft9001_prop_name, /* epo_prop_name */ -#endif - sft9001_prop_get, /* epo_prop_get */ - sft9001_prop_set, /* epo_prop_set */ -#endif /* EFSYS_OPT_PHY_PROPS */ -#if EFSYS_OPT_BIST - NULL, /* epo_bist_enable_offline */ - sft9001_bist_start, /* epo_bist_start */ - sft9001_bist_poll, /* epo_bist_poll */ - sft9001_bist_stop, /* epo_bist_stop */ -#endif /* EFSYS_OPT_BIST */ -}; -#endif /* EFSYS_OPT_PHY_SFT9001 */ - #if EFSYS_OPT_SIENA static efx_phy_ops_t __efx_phy_siena_ops = { siena_phy_power, /* epo_power */