Date: Sat, 4 Jun 2016 15:54:54 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r301349 - stable/10/sys/dev/sfxge/common Message-ID: <201606041554.u54FssvG023985@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Sat Jun 4 15:54:54 2016 New Revision: 301349 URL: https://svnweb.freebsd.org/changeset/base/301349 Log: MFC r299721 sfxge(4): remove PHY property method stubs Submitted by: Andy Moreton <amoreton at solarflare.com> Sponsored by: Solarflare Communications, Inc. Modified: stable/10/sys/dev/sfxge/common/ef10_impl.h stable/10/sys/dev/sfxge/common/ef10_phy.c stable/10/sys/dev/sfxge/common/efx_impl.h stable/10/sys/dev/sfxge/common/efx_phy.c stable/10/sys/dev/sfxge/common/siena_impl.h stable/10/sys/dev/sfxge/common/siena_phy.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sfxge/common/ef10_impl.h ============================================================================== --- stable/10/sys/dev/sfxge/common/ef10_impl.h Sat Jun 4 15:52:48 2016 (r301348) +++ stable/10/sys/dev/sfxge/common/ef10_impl.h Sat Jun 4 15:54:54 2016 (r301349) @@ -595,32 +595,6 @@ ef10_phy_stats_update( #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS - -#if EFSYS_OPT_NAMES - -extern const char * -ef10_phy_prop_name( - __in efx_nic_t *enp, - __in unsigned int id); - -#endif /* EFSYS_OPT_NAMES */ - -extern __checkReturn efx_rc_t -ef10_phy_prop_get( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t flags, - __out uint32_t *valp); - -extern __checkReturn efx_rc_t -ef10_phy_prop_set( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t val); - -#endif /* EFSYS_OPT_PHY_PROPS */ - /* TX */ Modified: stable/10/sys/dev/sfxge/common/ef10_phy.c ============================================================================== --- stable/10/sys/dev/sfxge/common/ef10_phy.c Sat Jun 4 15:52:48 2016 (r301348) +++ stable/10/sys/dev/sfxge/common/ef10_phy.c Sat Jun 4 15:54:54 2016 (r301349) @@ -474,45 +474,4 @@ ef10_phy_stats_update( #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS - -#if EFSYS_OPT_NAMES - - const char * -ef10_phy_prop_name( - __in efx_nic_t *enp, - __in unsigned int id) -{ - _NOTE(ARGUNUSED(enp, id)) - - return (NULL); -} - -#endif /* EFSYS_OPT_NAMES */ - - __checkReturn efx_rc_t -ef10_phy_prop_get( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t flags, - __out uint32_t *valp) -{ - _NOTE(ARGUNUSED(enp, id, flags, valp)) - - return (ENOTSUP); -} - - __checkReturn efx_rc_t -ef10_phy_prop_set( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t val) -{ - _NOTE(ARGUNUSED(enp, id, val)) - - return (ENOTSUP); -} - -#endif /* EFSYS_OPT_PHY_PROPS */ - #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */ Modified: stable/10/sys/dev/sfxge/common/efx_impl.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_impl.h Sat Jun 4 15:52:48 2016 (r301348) +++ stable/10/sys/dev/sfxge/common/efx_impl.h Sat Jun 4 15:54:54 2016 (r301349) @@ -217,14 +217,6 @@ typedef struct efx_phy_ops_s { efx_rc_t (*epo_stats_update)(efx_nic_t *, efsys_mem_t *, uint32_t *); #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS -#if EFSYS_OPT_NAMES - const char *(*epo_prop_name)(efx_nic_t *, unsigned int); -#endif /* EFSYS_OPT_PHY_PROPS */ - efx_rc_t (*epo_prop_get)(efx_nic_t *, unsigned int, uint32_t, - uint32_t *); - efx_rc_t (*epo_prop_set)(efx_nic_t *, unsigned int, uint32_t); -#endif /* EFSYS_OPT_PHY_PROPS */ #if EFSYS_OPT_BIST efx_rc_t (*epo_bist_enable_offline)(efx_nic_t *); efx_rc_t (*epo_bist_start)(efx_nic_t *, efx_bist_type_t); Modified: stable/10/sys/dev/sfxge/common/efx_phy.c ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_phy.c Sat Jun 4 15:52:48 2016 (r301348) +++ stable/10/sys/dev/sfxge/common/efx_phy.c Sat Jun 4 15:54:54 2016 (r301349) @@ -47,13 +47,6 @@ static const efx_phy_ops_t __efx_phy_sie #if EFSYS_OPT_PHY_STATS siena_phy_stats_update, /* epo_stats_update */ #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS -#if EFSYS_OPT_NAMES - siena_phy_prop_name, /* epo_prop_name */ -#endif - siena_phy_prop_get, /* epo_prop_get */ - siena_phy_prop_set, /* epo_prop_set */ -#endif /* EFSYS_OPT_PHY_PROPS */ #if EFSYS_OPT_BIST NULL, /* epo_bist_enable_offline */ siena_phy_bist_start, /* epo_bist_start */ @@ -75,13 +68,6 @@ static const efx_phy_ops_t __efx_phy_ef1 #if EFSYS_OPT_PHY_STATS ef10_phy_stats_update, /* epo_stats_update */ #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS -#if EFSYS_OPT_NAMES - ef10_phy_prop_name, /* epo_prop_name */ -#endif - ef10_phy_prop_get, /* epo_prop_get */ - ef10_phy_prop_set, /* epo_prop_set */ -#endif /* EFSYS_OPT_PHY_PROPS */ #if EFSYS_OPT_BIST /* FIXME: Are these BIST methods appropriate for Medford? */ hunt_bist_enable_offline, /* epo_bist_enable_offline */ @@ -445,13 +431,9 @@ efx_phy_prop_name( __in efx_nic_t *enp, __in unsigned int id) { - efx_port_t *epp = &(enp->en_port); - const efx_phy_ops_t *epop = epp->ep_epop; + _NOTE(ARGUNUSED(enp, id)) - EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); - EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE); - - return (epop->epo_prop_name(enp, id)); + return (NULL); } #endif /* EFSYS_OPT_NAMES */ @@ -462,13 +444,9 @@ efx_phy_prop_get( __in uint32_t flags, __out uint32_t *valp) { - efx_port_t *epp = &(enp->en_port); - const efx_phy_ops_t *epop = epp->ep_epop; + _NOTE(ARGUNUSED(enp, id, flags, valp)) - EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); - EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT); - - return (epop->epo_prop_get(enp, id, flags, valp)); + return (ENOTSUP); } __checkReturn efx_rc_t @@ -477,13 +455,9 @@ efx_phy_prop_set( __in unsigned int id, __in uint32_t val) { - efx_port_t *epp = &(enp->en_port); - const efx_phy_ops_t *epop = epp->ep_epop; - - EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); - EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT); + _NOTE(ARGUNUSED(enp, id, val)) - return (epop->epo_prop_set(enp, id, val)); + return (ENOTSUP); } #endif /* EFSYS_OPT_PHY_STATS */ Modified: stable/10/sys/dev/sfxge/common/siena_impl.h ============================================================================== --- stable/10/sys/dev/sfxge/common/siena_impl.h Sat Jun 4 15:52:48 2016 (r301348) +++ stable/10/sys/dev/sfxge/common/siena_impl.h Sat Jun 4 15:54:54 2016 (r301349) @@ -42,17 +42,6 @@ extern "C" { #endif -#if EFSYS_OPT_PHY_PROPS - -/* START MKCONFIG GENERATED SienaPhyHeaderPropsBlock a8db1f8eb5106efd */ -typedef enum siena_phy_prop_e { - SIENA_PHY_NPROPS -} siena_phy_prop_t; - -/* END MKCONFIG GENERATED SienaPhyHeaderPropsBlock */ - -#endif /* EFSYS_OPT_PHY_PROPS */ - #define SIENA_NVRAM_CHUNK 0x80 extern __checkReturn efx_rc_t @@ -360,32 +349,6 @@ siena_phy_stats_update( #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS - -#if EFSYS_OPT_NAMES - -extern const char * -siena_phy_prop_name( - __in efx_nic_t *enp, - __in unsigned int id); - -#endif /* EFSYS_OPT_NAMES */ - -extern __checkReturn efx_rc_t -siena_phy_prop_get( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t flags, - __out uint32_t *valp); - -extern __checkReturn efx_rc_t -siena_phy_prop_set( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t val); - -#endif /* EFSYS_OPT_PHY_PROPS */ - #if EFSYS_OPT_BIST extern __checkReturn efx_rc_t Modified: stable/10/sys/dev/sfxge/common/siena_phy.c ============================================================================== --- stable/10/sys/dev/sfxge/common/siena_phy.c Sat Jun 4 15:52:48 2016 (r301348) +++ stable/10/sys/dev/sfxge/common/siena_phy.c Sat Jun 4 15:54:54 2016 (r301349) @@ -592,47 +592,6 @@ fail1: #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_PHY_PROPS - -#if EFSYS_OPT_NAMES - -extern const char * -siena_phy_prop_name( - __in efx_nic_t *enp, - __in unsigned int id) -{ - _NOTE(ARGUNUSED(enp, id)) - - return (NULL); -} - -#endif /* EFSYS_OPT_NAMES */ - -extern __checkReturn efx_rc_t -siena_phy_prop_get( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t flags, - __out uint32_t *valp) -{ - _NOTE(ARGUNUSED(enp, id, flags, valp)) - - return (ENOTSUP); -} - -extern __checkReturn efx_rc_t -siena_phy_prop_set( - __in efx_nic_t *enp, - __in unsigned int id, - __in uint32_t val) -{ - _NOTE(ARGUNUSED(enp, id, val)) - - return (ENOTSUP); -} - -#endif /* EFSYS_OPT_PHY_PROPS */ - #if EFSYS_OPT_BIST __checkReturn efx_rc_t
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606041554.u54FssvG023985>