FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-28 04:17:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IB/qib: Drop qib_tune_pcie_caps() and qib_tune_pcie_coalesce() return values

Browse Source 
The callers of qib_tune_pcie_caps() and qib_tune_pcie_coalesce() don't
check the return values, so this patch drops the return values altogether.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
This commit is contained in:
Bjorn Helgaas 2013-09-24 14:24:49 -06:00
parent 0ce0e62f1f
commit 03078633a6
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/infiniband/hw/qib/qib_pcie.c
View File

@ -51,8 +51,8 @@
* file calls, even though this violates some * file calls, even though this violates some
* expectations of harmlessness. * expectations of harmlessness.
*/ */
static int qib_tune_pcie_caps(struct qib_devdata *); static void qib_tune_pcie_caps(struct qib_devdata *);
static int qib_tune_pcie_coalesce(struct qib_devdata *); static void qib_tune_pcie_coalesce(struct qib_devdata *);
/* /*
* Do all the common PCIe setup and initialization. * Do all the common PCIe setup and initialization.
@ -487,7 +487,7 @@ MODULE_PARM_DESC(pcie_coalesce, "tune PCIe colescing on some Intel chipsets");
* of these chipsets, with some BIOS settings, and enabling it on those * of these chipsets, with some BIOS settings, and enabling it on those
* systems may result in the system crashing, and/or data corruption. * systems may result in the system crashing, and/or data corruption.
*/ */
static int qib_tune_pcie_coalesce(struct qib_devdata *dd) static void qib_tune_pcie_coalesce(struct qib_devdata *dd)
{ {
int r; int r;
struct pci_dev *parent; struct pci_dev *parent;
@ -495,18 +495,18 @@ static int qib_tune_pcie_coalesce(struct qib_devdata *dd)
u32 mask, bits, val; u32 mask, bits, val;
if (!qib_pcie_coalesce) if (!qib_pcie_coalesce)
return 0; return;
/* Find out supported and configured values for parent (root) */ /* Find out supported and configured values for parent (root) */
parent = dd->pcidev->bus->self; parent = dd->pcidev->bus->self;
if (parent->bus->parent) { if (parent->bus->parent) {
qib_devinfo(dd->pcidev, "Parent not root\n"); qib_devinfo(dd->pcidev, "Parent not root\n");
return 1; return;
} }
if (!pci_is_pcie(parent)) if (!pci_is_pcie(parent))
return 1; return;
if (parent->vendor != 0x8086) if (parent->vendor != 0x8086)
return 1; return;
/* /*
* - bit 12: Max_rdcmp_Imt_EN: need to set to 1 * - bit 12: Max_rdcmp_Imt_EN: need to set to 1
@ -539,13 +539,12 @@ static int qib_tune_pcie_coalesce(struct qib_devdata *dd)
mask = (3U << 24) | (7U << 10); mask = (3U << 24) | (7U << 10);
} else { } else {
/* not one of the chipsets that we know about */ /* not one of the chipsets that we know about */
return 1; return;
} }
pci_read_config_dword(parent, 0x48, &val); pci_read_config_dword(parent, 0x48, &val);
val &= ~mask; val &= ~mask;
val |= bits; val |= bits;
r = pci_write_config_dword(parent, 0x48, val); r = pci_write_config_dword(parent, 0x48, val);
return 0;
} }
/* /*
@ -556,9 +555,8 @@ static int qib_pcie_caps;
module_param_named(pcie_caps, qib_pcie_caps, int, S_IRUGO); module_param_named(pcie_caps, qib_pcie_caps, int, S_IRUGO);
MODULE_PARM_DESC(pcie_caps, "Max PCIe tuning: Payload (0..3), ReadReq (4..7)"); MODULE_PARM_DESC(pcie_caps, "Max PCIe tuning: Payload (0..3), ReadReq (4..7)");
static int qib_tune_pcie_caps(struct qib_devdata *dd) static void qib_tune_pcie_caps(struct qib_devdata *dd)
{ {
int ret = 1; /* Assume the worst */
struct pci_dev *parent; struct pci_dev *parent;
u16 rc_mpss, rc_mps, ep_mpss, ep_mps; u16 rc_mpss, rc_mps, ep_mpss, ep_mps;
u16 rc_mrrs, ep_mrrs, max_mrrs; u16 rc_mrrs, ep_mrrs, max_mrrs;
@ -567,18 +565,18 @@ static int qib_tune_pcie_caps(struct qib_devdata *dd)
parent = dd->pcidev->bus->self; parent = dd->pcidev->bus->self;
if (!pci_is_root_bus(parent->bus)) { if (!pci_is_root_bus(parent->bus)) {
qib_devinfo(dd->pcidev, "Parent not root\n"); qib_devinfo(dd->pcidev, "Parent not root\n");
goto bail; return;
} }
if (!pci_is_pcie(parent) || !pci_is_pcie(dd->pcidev)) if (!pci_is_pcie(parent) || !pci_is_pcie(dd->pcidev))
goto bail; return;
rc_mpss = parent->pcie_mpss; rc_mpss = parent->pcie_mpss;
rc_mps = ffs(pcie_get_mps(parent)) - 8; rc_mps = ffs(pcie_get_mps(parent)) - 8;
/* Find out supported and configured values for endpoint (us) */ /* Find out supported and configured values for endpoint (us) */
ep_mpss = dd->pcidev->pcie_mpss; ep_mpss = dd->pcidev->pcie_mpss;
ep_mps = ffs(pcie_get_mps(dd->pcidev)) - 8; ep_mps = ffs(pcie_get_mps(dd->pcidev)) - 8;
ret = 0;
/* Find max payload supported by root, endpoint */ /* Find max payload supported by root, endpoint */
if (rc_mpss > ep_mpss) if (rc_mpss > ep_mpss)
rc_mpss = ep_mpss; rc_mpss = ep_mpss;
@ -618,8 +616,6 @@ static int qib_tune_pcie_caps(struct qib_devdata *dd)
ep_mrrs = max_mrrs; ep_mrrs = max_mrrs;
pcie_set_readrq(dd->pcidev, ep_mrrs); pcie_set_readrq(dd->pcidev, ep_mrrs);
} }
bail:
return ret;
} }
/* End of PCIe capability tuning */ /* End of PCIe capability tuning */