[dpdk-dev,v4,12/23] bnx2x: localize mapping from eth_dev to pci

Message ID 1482332986-7599-13-git-send-email-jblunck@infradead.org (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel compilation fail Compilation issues

Commit Message

Jan Blunck Dec. 21, 2016, 3:09 p.m. UTC
  Use device private information to minimize the places that assume eth_dev
contains pci_dev.

Signed-off-by: Jan Blunck <jblunck@infradead.org>
---
 drivers/net/bnx2x/bnx2x_ethdev.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
  

Comments

Harish Patil Dec. 21, 2016, 4:35 p.m. UTC | #1
>

>Use device private information to minimize the places that assume eth_dev

>contains pci_dev.

>

>Signed-off-by: Jan Blunck <jblunck@infradead.org>

>---

> drivers/net/bnx2x/bnx2x_ethdev.c | 12 ++++++------

> 1 file changed, 6 insertions(+), 6 deletions(-)

>

>diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c

>b/drivers/net/bnx2x/bnx2x_ethdev.c

>index 0eae433..ef2026a 100644

>--- a/drivers/net/bnx2x/bnx2x_ethdev.c

>+++ b/drivers/net/bnx2x/bnx2x_ethdev.c

>@@ -119,12 +119,12 @@ bnx2x_interrupt_action(struct rte_eth_dev *dev)

> }

> 

> static __rte_unused void

>-bnx2x_interrupt_handler(__rte_unused struct rte_intr_handle *handle,

>void *param)

>+bnx2x_interrupt_handler(struct rte_intr_handle *handle, void *param)

> {

> 	struct rte_eth_dev *dev = (struct rte_eth_dev *)param;

> 

> 	bnx2x_interrupt_action(dev);

>-	rte_intr_enable(&(dev->pci_dev->intr_handle));

>+	rte_intr_enable(handle);

> }

> 

> /*

>@@ -187,10 +187,10 @@ bnx2x_dev_start(struct rte_eth_dev *dev)

> 	}

> 

> 	if (IS_PF(sc)) {

>-		rte_intr_callback_register(&(dev->pci_dev->intr_handle),

>+		rte_intr_callback_register(&sc->pci_dev->intr_handle,

> 				bnx2x_interrupt_handler, (void *)dev);

> 

>-		if(rte_intr_enable(&(dev->pci_dev->intr_handle)))

>+		if (rte_intr_enable(&sc->pci_dev->intr_handle))

> 			PMD_DRV_LOG(ERR, "rte_intr_enable failed");

> 	}

> 

>@@ -215,8 +215,8 @@ bnx2x_dev_stop(struct rte_eth_dev *dev)

> 	PMD_INIT_FUNC_TRACE();

> 

> 	if (IS_PF(sc)) {

>-		rte_intr_disable(&(dev->pci_dev->intr_handle));

>-		rte_intr_callback_unregister(&(dev->pci_dev->intr_handle),

>+		rte_intr_disable(&sc->pci_dev->intr_handle);

>+		rte_intr_callback_unregister(&sc->pci_dev->intr_handle,

> 				bnx2x_interrupt_handler, (void *)dev);

> 	}

> 

>-- 

>2.7.4

>

>

Acked-by: Harish Patil <harish.patil@qlogic.com>
  

Patch

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 0eae433..ef2026a 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -119,12 +119,12 @@  bnx2x_interrupt_action(struct rte_eth_dev *dev)
 }
 
 static __rte_unused void
-bnx2x_interrupt_handler(__rte_unused struct rte_intr_handle *handle, void *param)
+bnx2x_interrupt_handler(struct rte_intr_handle *handle, void *param)
 {
 	struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
 
 	bnx2x_interrupt_action(dev);
-	rte_intr_enable(&(dev->pci_dev->intr_handle));
+	rte_intr_enable(handle);
 }
 
 /*
@@ -187,10 +187,10 @@  bnx2x_dev_start(struct rte_eth_dev *dev)
 	}
 
 	if (IS_PF(sc)) {
-		rte_intr_callback_register(&(dev->pci_dev->intr_handle),
+		rte_intr_callback_register(&sc->pci_dev->intr_handle,
 				bnx2x_interrupt_handler, (void *)dev);
 
-		if(rte_intr_enable(&(dev->pci_dev->intr_handle)))
+		if (rte_intr_enable(&sc->pci_dev->intr_handle))
 			PMD_DRV_LOG(ERR, "rte_intr_enable failed");
 	}
 
@@ -215,8 +215,8 @@  bnx2x_dev_stop(struct rte_eth_dev *dev)
 	PMD_INIT_FUNC_TRACE();
 
 	if (IS_PF(sc)) {
-		rte_intr_disable(&(dev->pci_dev->intr_handle));
-		rte_intr_callback_unregister(&(dev->pci_dev->intr_handle),
+		rte_intr_disable(&sc->pci_dev->intr_handle);
+		rte_intr_callback_unregister(&sc->pci_dev->intr_handle,
 				bnx2x_interrupt_handler, (void *)dev);
 	}