svn commit: r301358 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Sat Jun  4 16:15:31 2016
New Revision: 301358
URL: https://svnweb.freebsd.org/changeset/base/301358

Log:
  MFC r299732
  
  sfxge(4): remove unimplemented sensor reconfigure method
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx_impl.h
  stable/10/sys/dev/sfxge/common/efx_mon.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_impl.h	Sat Jun  4 16:13:18 2016	(r301357)
+++ stable/10/sys/dev/sfxge/common/efx_impl.h	Sat Jun  4 16:15:31 2016	(r301358)
@@ -292,7 +292,6 @@ typedef struct efx_port_s {
 } efx_port_t;
 
 typedef struct efx_mon_ops_s {
-	efx_rc_t	(*emo_reconfigure)(efx_nic_t *);
 #if EFSYS_OPT_MON_STATS
 	efx_rc_t	(*emo_stats_update)(efx_nic_t *, efsys_mem_t *,
 					    efx_mon_stat_value_t *);

Modified: stable/10/sys/dev/sfxge/common/efx_mon.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_mon.c	Sat Jun  4 16:13:18 2016	(r301357)
+++ stable/10/sys/dev/sfxge/common/efx_mon.c	Sat Jun  4 16:15:31 2016	(r301358)
@@ -67,7 +67,6 @@ efx_mon_name(
 
 #if EFSYS_OPT_MON_MCDI
 static const efx_mon_ops_t	__efx_mon_mcdi_ops = {
-	NULL,				/* emo_reconfigure */
 #if EFSYS_OPT_MON_STATS
 	mcdi_mon_stats_update		/* emo_stats_update */
 #endif	/* EFSYS_OPT_MON_STATS */
@@ -110,16 +109,9 @@ efx_mon_init(
 		goto fail2;
 	}
 
-	if (emop->emo_reconfigure != NULL) {
-		if ((rc = emop->emo_reconfigure(enp)) != 0)
-			goto fail3;
-	}
-
 	emp->em_emop = emop;
 	return (0);
 
-fail3:
-	EFSYS_PROBE(fail3);
 fail2:
 	EFSYS_PROBE(fail2);