提交 3d2de267 编写于 作者: K K. Y. Srinivasan 提交者: Greg Kroah-Hartman

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: NK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: NHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: NAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 9aaa995e
...@@ -552,9 +552,8 @@ static int vmbus_bus_init(int irq) ...@@ -552,9 +552,8 @@ static int vmbus_bus_init(int irq)
} }
/* Get the interrupt resource */ /* Get the interrupt resource */
ret = request_irq(irq, vmbus_isr, ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,
IRQF_SHARED | IRQF_SAMPLE_RANDOM, driver_name, hv_pci_dev);
driver_name, hv_pci_dev);
if (ret != 0) { if (ret != 0) {
pr_err("Unable to request IRQ %d\n", pr_err("Unable to request IRQ %d\n",
...@@ -787,15 +786,7 @@ static int __devinit hv_pci_probe(struct pci_dev *pdev, ...@@ -787,15 +786,7 @@ static int __devinit hv_pci_probe(struct pci_dev *pdev,
if (pci_probe_error) if (pci_probe_error)
goto probe_cleanup; goto probe_cleanup;
/* pci_probe_error = vmbus_bus_init(irq);
* 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);
if (pci_probe_error) if (pci_probe_error)
pci_disable_device(pdev); pci_disable_device(pdev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册