aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEaswar Hariharan <easwar.hariharan@intel.com>2016-10-17 07:19:58 -0400
committerDoug Ledford <dledford@redhat.com>2016-11-15 16:16:43 -0500
commit26ea2544ddbe8855cb251e41ff3641c61655a15f (patch)
tree0e5630c042083e8ec1b6313827aed6437abfac09
parenteacc830f95c0d8c5cbbda1bdba2ddc8f14bc248d (diff)
IB/hfi1: Clean up unused argument
hfi1_pcie_ddinit takes the PCI device id as an argument but never uses it. Clean it up. Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Easwar Hariharan <easwar.hariharan@intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--drivers/infiniband/hw/hfi1/chip.c2
-rw-r--r--drivers/infiniband/hw/hfi1/hfi.h3
-rw-r--r--drivers/infiniband/hw/hfi1/pcie.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 859341a25e56..156ddf8f3dca 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -14449,7 +14449,7 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev,
14449 * Any error printing is already done by the init code. 14449 * Any error printing is already done by the init code.
14450 * On return, we have the chip mapped. 14450 * On return, we have the chip mapped.
14451 */ 14451 */
14452 ret = hfi1_pcie_ddinit(dd, pdev, ent); 14452 ret = hfi1_pcie_ddinit(dd, pdev);
14453 if (ret < 0) 14453 if (ret < 0)
14454 goto bail_free; 14454 goto bail_free;
14455 14455
diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index 93e2fcebd083..d906cf08504f 100644
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -1736,8 +1736,7 @@ int qsfp_dump(struct hfi1_pportdata *ppd, char *buf, int len);
1736 1736
1737int hfi1_pcie_init(struct pci_dev *, const struct pci_device_id *); 1737int hfi1_pcie_init(struct pci_dev *, const struct pci_device_id *);
1738void hfi1_pcie_cleanup(struct pci_dev *); 1738void hfi1_pcie_cleanup(struct pci_dev *);
1739int hfi1_pcie_ddinit(struct hfi1_devdata *, struct pci_dev *, 1739int hfi1_pcie_ddinit(struct hfi1_devdata *, struct pci_dev *);
1740 const struct pci_device_id *);
1741void hfi1_pcie_ddcleanup(struct hfi1_devdata *); 1740void hfi1_pcie_ddcleanup(struct hfi1_devdata *);
1742void hfi1_pcie_flr(struct hfi1_devdata *); 1741void hfi1_pcie_flr(struct hfi1_devdata *);
1743int pcie_speeds(struct hfi1_devdata *); 1742int pcie_speeds(struct hfi1_devdata *);
diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c
index 89c68da1c273..4ac8f330c5cb 100644
--- a/drivers/infiniband/hw/hfi1/pcie.c
+++ b/drivers/infiniband/hw/hfi1/pcie.c
@@ -157,8 +157,7 @@ void hfi1_pcie_cleanup(struct pci_dev *pdev)
157 * fields required to re-initialize after a chip reset, or for 157 * fields required to re-initialize after a chip reset, or for
158 * various other purposes 158 * various other purposes
159 */ 159 */
160int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev, 160int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev)
161 const struct pci_device_id *ent)
162{ 161{
163 unsigned long len; 162 unsigned long len;
164 resource_size_t addr; 163 resource_size_t addr;