Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e3a1f4a authored by Ralph Campbell's avatar Ralph Campbell Committed by Roland Dreier
Browse files

IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=n 



This patch fixes a compile error saying qib_init_iba6120_funcs() is
undefined when CONFIG_PCI_MSI is not defined.  Thanks to Randy Dunlap
<randy.dunlap@oracle.com> for finding this and suggesting the fix.

Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent ec96e2fe

drivers/infiniband/hw/qib/qib_iba6120.c

+0 −12
Original line number Diff line number Diff line
@@ -3475,14 +3475,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev, 
	struct qib_devdata *dd;

	int ret;



#ifndef CONFIG_PCI_MSI

	qib_early_err(&pdev->dev, "QLogic PCIE device 0x%x cannot "

	      "work if CONFIG_PCI_MSI is not enabled\n",

	      ent->device);

	dd = ERR_PTR(-ENODEV);

	goto bail;

#endif



	dd = qib_alloc_devdata(pdev, sizeof(struct qib_pportdata) +

			       sizeof(struct qib_chip_specific));

	if (IS_ERR(dd))
@@ -3554,10 +3546,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev, 
	if (qib_mini_init)

		goto bail;



#ifndef CONFIG_PCI_MSI

	qib_dev_err(dd, "PCI_MSI not configured, NO interrupts\n");

#endif



	if (qib_pcie_params(dd, 8, NULL, NULL))

		qib_dev_err(dd, "Failed to setup PCIe or interrupts; "

			    "continuing anyway\n");

drivers/infiniband/hw/qib/qib_init.c

+6 −0
Original line number Diff line number Diff line
@@ -1237,7 +1237,13 @@ static int __devinit qib_init_one(struct pci_dev *pdev, 
	 */

	switch (ent->device) {

	case PCI_DEVICE_ID_QLOGIC_IB_6120:

#ifdef CONFIG_PCI_MSI

		dd = qib_init_iba6120_funcs(pdev, ent);

#else

		qib_early_err(&pdev->dev, "QLogic PCIE device 0x%x cannot "

		      "work if CONFIG_PCI_MSI is not enabled\n",

		      ent->device);

#endif

		break;



	case PCI_DEVICE_ID_QLOGIC_IB_7220: