frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

ddbridge: fix CONFIG_PCI_MSI #ifdef'ery (fixes failing build w/o MSI), fix "warning: ‘stat’ may be used uninitialized in this function

Browse Source 
[-Wmaybe-uninitialized]" in ddb_irq_msi()
This commit is contained in:
Daniel Scheller 2017-01-21 17:53:47 +01:00
parent 1f77192d62
commit 1ae4a55c9d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ddbridge/ddbridge.c
View File

@ -111,11 +111,11 @@ static void __devexit ddb_remove(struct pci_dev *pdev)
#define __devinitdata #define __devinitdata
#endif #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; int stat;
#ifdef CONFIG_PCI_MSI
if (msi && pci_msi_enabled()) { if (msi && pci_msi_enabled()) {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
stat = pci_enable_msi_range(dev->pdev, 1, nr); 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"); pr_info("DDBridge: MSI not available.\n");
#endif #endif
} }
return stat;
} }
#endif
static int __devinit ddb_irq_init2(struct ddb *dev) 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_6);
ddbwritel(dev, 0x00000000, INTERRUPT_V2_ENABLE_7); ddbwritel(dev, 0x00000000, INTERRUPT_V2_ENABLE_7);
#ifdef CONFIG_PCI_MSI
ddb_irq_msi(dev, 1); ddb_irq_msi(dev, 1);
if (dev->msi) if (dev->msi)
irq_flag = 0; irq_flag = 0;
#endif
stat = request_irq(dev->pdev->irq, irq_handler_v2, stat = request_irq(dev->pdev->irq, irq_handler_v2,
irq_flag, "ddbridge", (void *) dev); 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, MSI6_ENABLE);
ddbwritel(dev, 0x00000000, MSI7_ENABLE); ddbwritel(dev, 0x00000000, MSI7_ENABLE);
#ifdef CONFIG_PCI_MSI
ddb_irq_msi(dev, 2); ddb_irq_msi(dev, 2);
if (dev->msi) if (dev->msi)