dect
/
linux-2.6
Archived
13
0
Fork 0

Staging: hv: vmbus: Use the DSDT specified irq for vmbus

DSDT specifies the irq value for the vmbus driver; use it unconditionally.
This is an exclusive interrupt line dedicated for the vmbus driver.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-06-06 15:49:38 -07:00 committed by Greg Kroah-Hartman
parent 9aaa995e6a
commit 3d2de26762
1 changed files with 3 additions and 12 deletions

View File

@ -552,9 +552,8 @@ static int vmbus_bus_init(int irq)
}
/* Get the interrupt resource */
ret = request_irq(irq, vmbus_isr,
IRQF_SHARED | IRQF_SAMPLE_RANDOM,
driver_name, hv_pci_dev);
ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,
driver_name, hv_pci_dev);
if (ret != 0) {
pr_err("Unable to request IRQ %d\n",
@ -787,15 +786,7 @@ static int __devinit hv_pci_probe(struct pci_dev *pdev,
if (pci_probe_error)
goto probe_cleanup;
/*
* If the PCI sub-sytem did not assign us an
* irq, use the bios provided one.
*/
if (pdev->irq == 0)
pdev->irq = irq;
pci_probe_error = vmbus_bus_init(pdev->irq);
pci_probe_error = vmbus_bus_init(irq);
if (pci_probe_error)
pci_disable_device(pdev);