[dpdk-dev] [PATCH 01/13] net/sfc: clarify interrupts support function names

Andrew Rybchenko arybchenko at solarflare.com
Fri Mar 31 12:22:11 CEST 2017


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 <arybchenko at solarflare.com>
---
 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");
 
-- 
2.9.3



More information about the dev mailing list