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 <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_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 */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
