From owner-svn-src-stable@freebsd.org  Sat Jun  4 16:42:32 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 AA0D9B6AB8A;
 Sat,  4 Jun 2016 16:42:32 +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 78D8519CC;
 Sat,  4 Jun 2016 16:42:32 +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 u54GgV8X043549;
 Sat, 4 Jun 2016 16:42:31 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u54GgVB0043548;
 Sat, 4 Jun 2016 16:42:31 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201606041642.u54GgVB0043548@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Sat, 4 Jun 2016 16:42:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301375 - stable/10/sys/dev/sfxge/common
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jun 2016 16:42:32 -0000

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

Log:
  MFC r299920
  
  sfxge(4): cleanup: simplify ef10_ev_qcreate
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

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

Modified: stable/10/sys/dev/sfxge/common/ef10_ev.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/ef10_ev.c	Sat Jun  4 16:41:31 2016	(r301374)
+++ stable/10/sys/dev/sfxge/common/ef10_ev.c	Sat Jun  4 16:42:31 2016	(r301375)
@@ -92,8 +92,7 @@ efx_mcdi_init_evq(
 	__in		unsigned int instance,
 	__in		efsys_mem_t *esmp,
 	__in		size_t nevs,
-	__in		uint32_t irq,
-	__out_opt	uint32_t *irqp)
+	__in		uint32_t irq)
 {
 	efx_mcdi_req_t req;
 	uint8_t payload[
@@ -175,8 +174,7 @@ efx_mcdi_init_evq(
 		goto fail3;
 	}
 
-	if (irqp != NULL)
-		*irqp = MCDI_OUT_DWORD(req, INIT_EVQ_OUT_IRQ);
+	/* NOTE: ignore the returned IRQ param as firmware does not set it. */
 
 	return (0);
 
@@ -275,12 +273,9 @@ ef10_ev_qcreate(
 	eep->ee_drv_gen	= ef10_ev_drv_gen;
 	eep->ee_mcdi	= ef10_ev_mcdi;
 
-	/*
-	 * Set up the event queue
-	 * NOTE: ignore the returned IRQ param as firmware does not set it.
-	 */
+	/* Set up the event queue */
 	irq = index;	/* INIT_EVQ expects function-relative vector number */
-	if ((rc = efx_mcdi_init_evq(enp, index, esmp, n, irq, NULL)) != 0)
+	if ((rc = efx_mcdi_init_evq(enp, index, esmp, n, irq)) != 0)
 		goto fail3;
 
 	return (0);