net/mlx5: fix build with strict alignment enabled

[dpdk.git] / drivers / common / octeontx2 / otx2_dev.c

diff --git a/drivers/common/octeontx2/otx2_dev.c b/drivers/common/octeontx2/otx2_dev.c
index 53a0c6e..9102709 100644 (file)
--- a/drivers/common/octeontx2/otx2_dev.c
+++ b/drivers/common/octeontx2/otx2_dev.c
@@ -744,9 +744,9 @@ static void
 mbox_unregister_irq(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
 {
        if (otx2_dev_is_vf(dev))
-               return mbox_unregister_vf_irq(pci_dev, dev);
+               mbox_unregister_vf_irq(pci_dev, dev);
        else
-               return mbox_unregister_pf_irq(pci_dev, dev);
+               mbox_unregister_pf_irq(pci_dev, dev);
 }
 
 static int
@@ -791,9 +791,8 @@ otx2_pf_vf_flr_irq(void *param)
                        if (!(intr & (1ULL << vf)))
                                continue;
 
-                       vf = 64 * i + vf;
                        otx2_base_dbg("FLR: i :%d intr: 0x%" PRIx64 ", vf-%d",
-                                     i, intr, vf);
+                                     i, intr, (64 * i + vf));
                        /* Clear interrupt */
                        otx2_write64(BIT_ULL(vf), bar2 + RVU_PF_VFFLR_INTX(i));
                        /* Disable the interrupt */
@@ -875,20 +874,9 @@ otx2_dev_active_vfs(void *otx2_dev)
        return count;
 }
 
-static void
-otx2_update_pass_hwcap(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-       RTE_SET_USED(pci_dev);
-
-       /* Update this logic when we have A1 */
-       dev->hwcap |= OTX2_HWCAP_F_A0;
-}
-
 static void
 otx2_update_vf_hwcap(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
 {
-       dev->hwcap = 0;
-
        switch (pci_dev->id.device_id) {
        case PCI_DEVID_OCTEONTX2_RVU_PF:
                break;
@@ -907,7 +895,7 @@ otx2_update_vf_hwcap(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
  * Initialize the otx2 device
  */
 int
-otx2_dev_init(struct rte_pci_device *pci_dev, void *otx2_dev)
+otx2_dev_priv_init(struct rte_pci_device *pci_dev, void *otx2_dev)
 {
        int up_direction = MBOX_DIR_PFAF_UP;
        int rc, direction = MBOX_DIR_PFAF;
@@ -931,7 +919,6 @@ otx2_dev_init(struct rte_pci_device *pci_dev, void *otx2_dev)
        dev->bar4 = bar4;
 
        otx2_update_vf_hwcap(pci_dev, dev);
-       otx2_update_pass_hwcap(pci_dev, dev);
 
        if (otx2_dev_is_vf(dev)) {
                direction = MBOX_DIR_VFPF;