diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2015-12-04 09:01:58 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2015-12-04 09:01:58 +0000 |
commit | 4722f6ef280f20e48dc096eaf119bab6edb0c941 (patch) | |
tree | 71dadc03757facde11e65ef85e2d47e316a5c13c /sys/ofed/drivers | |
parent | a4889f2dd0755dee10f2b2054bcc85bb0356c004 (diff) | |
download | src-4722f6ef280f20e48dc096eaf119bab6edb0c941.tar.gz src-4722f6ef280f20e48dc096eaf119bab6edb0c941.zip |
Fix scope of bridge_header and bridge_pcix_cap in mthca_reset(..)
They're only used in the __linux__ case
Differential Revision: https://reviews.freebsd.org/D4332
MFC after: 1 week
Reported by: cppcheck
Reviewed by: hselasky
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=291753
Diffstat (limited to 'sys/ofed/drivers')
-rw-r--r-- | sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c b/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c index ab059a635ed2..f571bd6d1ca2 100644 --- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c +++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c @@ -43,9 +43,13 @@ int mthca_reset(struct mthca_dev *mdev) int i; int err = 0; u32 *hca_header = NULL; +#ifdef __linux__ u32 *bridge_header = NULL; +#endif struct pci_dev *bridge = NULL; +#ifdef __linux__ int bridge_pcix_cap = 0; +#endif int hca_pcie_cap = 0; int hca_pcix_cap = 0; @@ -195,6 +199,7 @@ int mthca_reset(struct mthca_dev *mdev) } good: +#ifdef __linux__ /* Now restore the PCI headers */ if (bridge) { if (pci_write_config_dword(bridge, bridge_pcix_cap + 0x8, @@ -235,6 +240,7 @@ good: goto out; } } +#endif if (hca_pcix_cap) { if (pci_write_config_dword(mdev->pdev, hca_pcix_cap, @@ -289,8 +295,8 @@ out: #ifdef __linux__ if (bridge) pci_dev_put(bridge); -#endif kfree(bridge_header); +#endif kfree(hca_header); return err; |