From owner-svn-src-all@freebsd.org Tue May 10 07:15:58 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 775FFB356E4; Tue, 10 May 2016 07:15:58 +0000 (UTC) (envelope-from arybchik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3ABF71FFE; Tue, 10 May 2016 07:15:58 +0000 (UTC) (envelope-from arybchik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4A7Fvj0017776; Tue, 10 May 2016 07:15:57 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4A7Fv4o017774; Tue, 10 May 2016 07:15:57 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201605100715.u4A7Fv4o017774@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Tue, 10 May 2016 07:15:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299331 - head/sys/dev/sfxge/common X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2016 07:15:58 -0000 Author: arybchik Date: Tue May 10 07:15:57 2016 New Revision: 299331 URL: https://svnweb.freebsd.org/changeset/base/299331 Log: sfxge(4): remove EFSYS_OPT_PHY_NULL Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. MFC after: 1 week Modified: head/sys/dev/sfxge/common/efx_check.h head/sys/dev/sfxge/common/efx_phy.c Modified: head/sys/dev/sfxge/common/efx_check.h ============================================================================== --- head/sys/dev/sfxge/common/efx_check.h Tue May 10 07:15:09 2016 (r299330) +++ head/sys/dev/sfxge/common/efx_check.h Tue May 10 07:15:57 2016 (r299331) @@ -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_NULL (0) #define EFSYS_OPT_PHY_QT2022C2 (0) #define EFSYS_OPT_PHY_QT2025C (0) #define EFSYS_OPT_PHY_SFT9001 (0) @@ -243,12 +242,9 @@ # endif #endif /* EFSYS_OPT_PHY_LED_CONTROL */ -/* Support NULL PHY */ -#if EFSYS_OPT_PHY_NULL -# if !EFSYS_OPT_FALCON -# error "PHY_NULL requires FALCON" -# endif -#endif /* EFSYS_OPT_PHY_NULL */ +#ifdef EFSYS_OPT_PHY_NULL +# error "PHY_NULL is obsolete and is not supported." +#endif /* Obsolete option */ #ifdef EFSYS_OPT_PHY_PM8358 Modified: head/sys/dev/sfxge/common/efx_phy.c ============================================================================== --- head/sys/dev/sfxge/common/efx_phy.c Tue May 10 07:15:09 2016 (r299330) +++ head/sys/dev/sfxge/common/efx_phy.c Tue May 10 07:15:57 2016 (r299331) @@ -34,10 +34,6 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" -#if EFSYS_OPT_PHY_NULL -#include "nullphy.h" -#endif - #if EFSYS_OPT_PHY_QT2022C2 #include "qt2022c2.h" #endif @@ -58,34 +54,6 @@ __FBSDID("$FreeBSD$"); #include "qt2025c.h" #endif -#if EFSYS_OPT_PHY_NULL -static efx_phy_ops_t __efx_phy_null_ops = { - NULL, /* epo_power */ - nullphy_reset, /* epo_reset */ - nullphy_reconfigure, /* epo_reconfigure */ - nullphy_verify, /* epo_verify */ - NULL, /* epo_uplink_check */ - nullphy_downlink_check, /* epo_downlink_check */ - nullphy_oui_get, /* epo_oui_get */ -#if EFSYS_OPT_PHY_STATS - nullphy_stats_update, /* epo_stats_update */ -#endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS -#if EFSYS_OPT_NAMES - nullphy_prop_name, /* epo_prop_name */ -#endif - nullphy_prop_get, /* epo_prop_get */ - nullphy_prop_set, /* epo_prop_set */ -#endif /* EFSYS_OPT_PHY_PROPS */ -#if EFSYS_OPT_BIST - NULL, /* epo_bist_enable_offline */ - NULL, /* epo_bist_start */ - NULL, /* epo_bist_poll */ - NULL, /* epo_bist_stop */ -#endif /* EFSYS_OPT_BIST */ -}; -#endif /* EFSYS_OPT_PHY_NULL */ - #if EFSYS_OPT_PHY_QT2022C2 static efx_phy_ops_t __efx_phy_qt2022c2_ops = { NULL, /* epo_power */