Commit 6e5b6131 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Greg Kroah-Hartman

staging: rdma: hfi1: Remove hfi1_nomsix() wrapper function

This patch removes hfi1_nomsix() wrapper function that is used to wrap
pci_disable_msix() and so substituted the wrapper function by a direct
call to pci_disable_msix().
Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99d19626
...@@ -8785,7 +8785,7 @@ static void clean_up_interrupts(struct hfi1_devdata *dd) ...@@ -8785,7 +8785,7 @@ static void clean_up_interrupts(struct hfi1_devdata *dd)
/* turn off interrupts */ /* turn off interrupts */
if (dd->num_msix_entries) { if (dd->num_msix_entries) {
/* MSI-X */ /* MSI-X */
hfi1_nomsix(dd); pci_disable_msix(dd->pcidev);
} else { } else {
/* INTx */ /* INTx */
disable_intx(dd->pcidev); disable_intx(dd->pcidev);
......
...@@ -1612,7 +1612,6 @@ void hfi1_pcie_flr(struct hfi1_devdata *); ...@@ -1612,7 +1612,6 @@ void hfi1_pcie_flr(struct hfi1_devdata *);
int pcie_speeds(struct hfi1_devdata *); int pcie_speeds(struct hfi1_devdata *);
void request_msix(struct hfi1_devdata *, u32 *, struct hfi1_msix_entry *); void request_msix(struct hfi1_devdata *, u32 *, struct hfi1_msix_entry *);
void hfi1_enable_intx(struct pci_dev *); void hfi1_enable_intx(struct pci_dev *);
void hfi1_nomsix(struct hfi1_devdata *);
void restore_pci_variables(struct hfi1_devdata *dd); void restore_pci_variables(struct hfi1_devdata *dd);
int do_pcie_gen3_transition(struct hfi1_devdata *dd); int do_pcie_gen3_transition(struct hfi1_devdata *dd);
int parse_platform_config(struct hfi1_devdata *dd); int parse_platform_config(struct hfi1_devdata *dd);
......
...@@ -426,14 +426,6 @@ void request_msix(struct hfi1_devdata *dd, u32 *nent, ...@@ -426,14 +426,6 @@ void request_msix(struct hfi1_devdata *dd, u32 *nent,
tune_pcie_caps(dd); tune_pcie_caps(dd);
} }
/*
* Disable MSI-X.
*/
void hfi1_nomsix(struct hfi1_devdata *dd)
{
pci_disable_msix(dd->pcidev);
}
void hfi1_enable_intx(struct pci_dev *pdev) void hfi1_enable_intx(struct pci_dev *pdev)
{ {
/* first, turn on INTx */ /* first, turn on INTx */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment