Skip to content

Commit 41400bc

Browse files
Philipp Stannerbjorn-helgaas
authored andcommitted
net/ethernet: Use never-managed version of pci_intx()
pci_intx() is a hybrid function which can sometimes be managed through devres. To remove this hybrid nature from pci_intx(), it is necessary to port users to either an always-managed or a never-managed version. broadcom/bnx2x and brocade/bna enable their PCI devices with pci_enable_device(). Thus, they need the never-managed version. Replace pci_intx() with pci_intx_unmanaged(). Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Philipp Stanner <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Acked-by: Paolo Abeni <[email protected]>
1 parent 97fd880 commit 41400bc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp)
16691669
REG_WR(bp, IGU_REG_PF_CONFIGURATION, val);
16701670

16711671
if (val & IGU_PF_CONF_INT_LINE_EN)
1672-
pci_intx(bp->pdev, true);
1672+
pci_intx_unmanaged(bp->pdev, true);
16731673

16741674
barrier();
16751675

drivers/net/ethernet/brocade/bna/bnad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2669,7 +2669,7 @@ bnad_enable_msix(struct bnad *bnad)
26692669
}
26702670
}
26712671

2672-
pci_intx(bnad->pcidev, 0);
2672+
pci_intx_unmanaged(bnad->pcidev, 0);
26732673

26742674
return;
26752675

0 commit comments

Comments
 (0)