From 525973967757b67497ba0cc5b03528062d7f6f82 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Fri, 31 Mar 2017 11:22:11 +0100 Subject: [PATCH] net/sfc: clarify interrupts support function names 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") Cc: stable@dpdk.org 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 181d87a1bb..ad3dab136e 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 @@ fail_port_init: 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 a7a9868321..e77639e15f 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 c57cdaefbd..0d199b41b6 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 @@ done: } void -sfc_intr_fini(struct sfc_adapter *sa) +sfc_intr_close(struct sfc_adapter *sa) { sfc_log_init(sa, "entry"); -- 2.20.1