From patchwork Fri Mar 31 10:22:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 22990 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 503EC2C1A; Fri, 31 Mar 2017 12:22:51 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id DF53D2B93 for ; Fri, 31 Mar 2017 12:22:37 +0200 (CEST) Received: from pure.maildistiller.com (unknown [10.110.50.29]) by dispatch1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTP id 7594680062 for ; Fri, 31 Mar 2017 10:22:37 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx8-us1.ppe-hosted.com (unknown [10.110.49.251]) by pure.maildistiller.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 0476560049 for ; Fri, 31 Mar 2017 10:22:37 +0000 (UTC) Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx8-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 9A2D6440082 for ; Fri, 31 Mar 2017 10:22:35 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Fri, 31 Mar 2017 03:22:30 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25 via Frontend Transport; Fri, 31 Mar 2017 03:22:30 -0700 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2VAMTWj030624 for ; Fri, 31 Mar 2017 11:22:29 +0100 Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2VAMTQf009951 for ; Fri, 31 Mar 2017 11:22:29 +0100 From: Andrew Rybchenko To: Date: Fri, 31 Mar 2017 11:22:11 +0100 Message-ID: <1490955743-9868-2-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1490955743-9868-1-git-send-email-arybchenko@solarflare.com> References: <1490955743-9868-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-MDID: 1490955757-VzYsUT+50Ej1 Subject: [dpdk-dev] [PATCH 01/13] net/sfc: clarify interrupts support function names X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Make it clear that corresponding functions should be called on device configure and close operations. No functional change. Fixes: 06bc197796e2 ("net/sfc: interrupts support sufficient for event queue init") Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc.c | 10 +++++----- drivers/net/sfc/sfc.h | 4 ++-- drivers/net/sfc/sfc_intr.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 181d87a..ad3dab1 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -405,9 +405,9 @@ sfc_configure(struct sfc_adapter *sa) if (rc != 0) goto fail_check_conf; - rc = sfc_intr_init(sa); + rc = sfc_intr_configure(sa); if (rc != 0) - goto fail_intr_init; + goto fail_intr_configure; rc = sfc_ev_init(sa); if (rc != 0) @@ -439,9 +439,9 @@ sfc_configure(struct sfc_adapter *sa) sfc_ev_fini(sa); fail_ev_init: - sfc_intr_fini(sa); + sfc_intr_close(sa); -fail_intr_init: +fail_intr_configure: fail_check_conf: sa->state = SFC_ADAPTER_INITIALIZED; sfc_log_init(sa, "failed %d", rc); @@ -462,7 +462,7 @@ sfc_close(struct sfc_adapter *sa) sfc_rx_fini(sa); sfc_port_fini(sa); sfc_ev_fini(sa); - sfc_intr_fini(sa); + sfc_intr_close(sa); sa->state = SFC_ADAPTER_INITIALIZED; sfc_log_init(sa, "done"); diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index a7a9868..e77639e 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -298,8 +298,8 @@ void sfc_close(struct sfc_adapter *sa); int sfc_intr_attach(struct sfc_adapter *sa); void sfc_intr_detach(struct sfc_adapter *sa); -int sfc_intr_init(struct sfc_adapter *sa); -void sfc_intr_fini(struct sfc_adapter *sa); +int sfc_intr_configure(struct sfc_adapter *sa); +void sfc_intr_close(struct sfc_adapter *sa); int sfc_intr_start(struct sfc_adapter *sa); void sfc_intr_stop(struct sfc_adapter *sa); diff --git a/drivers/net/sfc/sfc_intr.c b/drivers/net/sfc/sfc_intr.c index c57cdae..0d199b4 100644 --- a/drivers/net/sfc/sfc_intr.c +++ b/drivers/net/sfc/sfc_intr.c @@ -259,7 +259,7 @@ sfc_intr_stop(struct sfc_adapter *sa) } int -sfc_intr_init(struct sfc_adapter *sa) +sfc_intr_configure(struct sfc_adapter *sa) { struct sfc_intr *intr = &sa->intr; @@ -293,7 +293,7 @@ sfc_intr_init(struct sfc_adapter *sa) } void -sfc_intr_fini(struct sfc_adapter *sa) +sfc_intr_close(struct sfc_adapter *sa) { sfc_log_init(sa, "entry");