From owner-svn-src-all@freebsd.org Sat May 14 06:17:04 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 DF99DB3AC79; Sat, 14 May 2016 06:17:04 +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 951351A80; Sat, 14 May 2016 06:17:04 +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 u4E6H3Ps070338; Sat, 14 May 2016 06:17:03 GMT (envelope-from arybchik@FreeBSD.org) Received: (from arybchik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4E6H3hn070336; Sat, 14 May 2016 06:17:03 GMT (envelope-from arybchik@FreeBSD.org) Message-Id: <201605140617.u4E6H3hn070336@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arybchik set sender to arybchik@FreeBSD.org using -f From: Andrew Rybchenko Date: Sat, 14 May 2016 06:17:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299731 - 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: Sat, 14 May 2016 06:17:05 -0000 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 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;