mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 11:40:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Amitoj Kaur Chawla
2015-11-01 16:14:32 +05:30
committed by Greg Kroah-Hartman
parent 99d19626b3
commit 6e5b613180
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/rdma/hfi1/chip.c
View File

@@ -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);

1
drivers/staging/rdma/hfi1/hfi.h
View File

@@ -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);

8
drivers/staging/rdma/hfi1/pcie.c
View File

@@ -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 */