From 1ae4a55c9dd2d8c3a386e92c0f3e2b3421d08b69 Mon Sep 17 00:00:00 2001 From: Daniel Scheller Date: Sat, 21 Jan 2017 17:53:47 +0100 Subject: [PATCH] =?UTF-8?q?ddbridge:=20fix=20CONFIG=5FPCI=5FMSI=20#ifdef'e?= =?UTF-8?q?ry=20(fixes=20failing=20build=20w/o=20MSI),=20fix=20"warning:?= =?UTF-8?q?=20=E2=80=98stat=E2=80=99=20may=20be=20used=20uninitialized=20i?= =?UTF-8?q?n=20this=20function=20[-Wmaybe-uninitialized]"=20in=20ddb=5Firq?= =?UTF-8?q?=5Fmsi()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ddbridge/ddbridge.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ddbridge/ddbridge.c b/ddbridge/ddbridge.c index 704f84c..43b0cab 100644 --- a/ddbridge/ddbridge.c +++ b/ddbridge/ddbridge.c @@ -111,11 +111,11 @@ static void __devexit ddb_remove(struct pci_dev *pdev) #define __devinitdata #endif -static int __devinit ddb_irq_msi(struct ddb *dev, int nr) +#ifdef CONFIG_PCI_MSI +static void __devinit ddb_irq_msi(struct ddb *dev, int nr) { int stat; -#ifdef CONFIG_PCI_MSI if (msi && pci_msi_enabled()) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) stat = pci_enable_msi_range(dev->pdev, 1, nr); @@ -139,8 +139,8 @@ static int __devinit ddb_irq_msi(struct ddb *dev, int nr) pr_info("DDBridge: MSI not available.\n"); #endif } - return stat; } +#endif static int __devinit ddb_irq_init2(struct ddb *dev) { @@ -158,9 +158,11 @@ static int __devinit ddb_irq_init2(struct ddb *dev) ddbwritel(dev, 0x00000000, INTERRUPT_V2_ENABLE_6); ddbwritel(dev, 0x00000000, INTERRUPT_V2_ENABLE_7); +#ifdef CONFIG_PCI_MSI ddb_irq_msi(dev, 1); if (dev->msi) irq_flag = 0; +#endif stat = request_irq(dev->pdev->irq, irq_handler_v2, irq_flag, "ddbridge", (void *) dev); @@ -195,6 +197,7 @@ static int __devinit ddb_irq_init(struct ddb *dev) ddbwritel(dev, 0x00000000, MSI6_ENABLE); ddbwritel(dev, 0x00000000, MSI7_ENABLE); +#ifdef CONFIG_PCI_MSI ddb_irq_msi(dev, 2); if (dev->msi)