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: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index e48981994b107c0794331247a6789e7b2d50a3d5..a6265277cfe5a038edd28da5a257a8f1c5557fd0 100644 (file)
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -8785,7 +8785,7 @@ static void clean_up_interrupts(struct hfi1_devdata *dd)
        /* turn off interrupts */
        if (dd->num_msix_entries) {
                /* MSI-X */
-               hfi1_nomsix(dd);
+               pci_disable_msix(dd->pcidev);
        } else {
                /* INTx */
                disable_intx(dd->pcidev);

diff --git a/drivers/staging/rdma/hfi1/hfi.h b/drivers/staging/rdma/hfi1/hfi.h
index 190f7a2f67731451e7c8035e8aaab1704e5aff9e..73bd966f9e4179a3d5efdcfe0ba6f07817b04332 100644 (file)
--- a/drivers/staging/rdma/hfi1/hfi.h
+++ b/drivers/staging/rdma/hfi1/hfi.h
@@ -1612,7 +1612,6 @@ void hfi1_pcie_flr(struct hfi1_devdata *);
 int pcie_speeds(struct hfi1_devdata *);
 void request_msix(struct hfi1_devdata *, u32 *, struct hfi1_msix_entry *);
 void hfi1_enable_intx(struct pci_dev *);
-void hfi1_nomsix(struct hfi1_devdata *);
 void restore_pci_variables(struct hfi1_devdata *dd);
 int do_pcie_gen3_transition(struct hfi1_devdata *dd);
 int parse_platform_config(struct hfi1_devdata *dd);

diff --git a/drivers/staging/rdma/hfi1/pcie.c b/drivers/staging/rdma/hfi1/pcie.c
index a956044459a2b29ea83bc0223c9b470448502dcb..f531d0f6b212f54054993f094d10acbeb846c906 100644 (file)
--- a/drivers/staging/rdma/hfi1/pcie.c
+++ b/drivers/staging/rdma/hfi1/pcie.c
@@ -426,14 +426,6 @@ void request_msix(struct hfi1_devdata *dd, u32 *nent,
        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)
 {
        /* first, turn on INTx */