svn commit: r299731 - head/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Sat May 14 06:17:03 2016
New Revision: 299731
URL: https://svnweb.freebsd.org/changeset/base/299731

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

Modified:
  head/sys/dev/sfxge/common/efx_impl.h
  head/sys/dev/sfxge/common/efx_mon.c

Modified: head/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_impl.h        Sat May 14 06:16:14 2016        
(r299730)
+++ head/sys/dev/sfxge/common/efx_impl.h        Sat May 14 06:17:03 2016        
(r299731)
@@ -292,7 +292,6 @@ typedef struct efx_port_s {
 } efx_port_t;
 
 typedef struct efx_mon_ops_s {
-       efx_rc_t        (*emo_reset)(efx_nic_t *);
        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 *,

Modified: head/sys/dev/sfxge/common/efx_mon.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_mon.c Sat May 14 06:16:14 2016        
(r299730)
+++ head/sys/dev/sfxge/common/efx_mon.c Sat May 14 06:17:03 2016        
(r299731)
@@ -67,7 +67,6 @@ efx_mon_name(
 
 #if EFSYS_OPT_MON_MCDI
 static const efx_mon_ops_t     __efx_mon_mcdi_ops = {
-       NULL,                           /* emo_reset */
        NULL,                           /* emo_reconfigure */
 #if EFSYS_OPT_MON_STATS
        mcdi_mon_stats_update           /* emo_stats_update */
@@ -111,29 +110,18 @@ efx_mon_init(
                goto fail2;
        }
 
-       if (emop->emo_reset != NULL) {
-               if ((rc = emop->emo_reset(enp)) != 0)
-                       goto fail3;
-       }
-
        if (emop->emo_reconfigure != NULL) {
                if ((rc = emop->emo_reconfigure(enp)) != 0)
-                       goto fail4;
+                       goto fail3;
        }
 
        emp->em_emop = emop;
        return (0);
 
-fail4:
-       EFSYS_PROBE(fail5);
-
-       if (emop->emo_reset != NULL)
-               (void) emop->emo_reset(enp);
-
 fail3:
-       EFSYS_PROBE(fail4);
-fail2:
        EFSYS_PROBE(fail3);
+fail2:
+       EFSYS_PROBE(fail2);
 
        emp->em_type = EFX_MON_INVALID;
 
@@ -268,8 +256,6 @@ efx_mon_fini(
        __in    efx_nic_t *enp)
 {
        efx_mon_t *emp = &(enp->en_mon);
-       const efx_mon_ops_t *emop = emp->em_emop;
-       efx_rc_t rc;
 
        EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
@@ -277,12 +263,6 @@ efx_mon_fini(
 
        emp->em_emop = NULL;
 
-       if (emop->emo_reset != NULL) {
-               rc = emop->emo_reset(enp);
-               if (rc != 0)
-                       EFSYS_PROBE1(fail1, efx_rc_t, rc);
-       }
-
        emp->em_type = EFX_MON_INVALID;
 
        enp->en_mod_flags &= ~EFX_MOD_MON;
_______________________________________________
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"