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

Commit 3d2de267 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

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: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9aaa995e

drivers/staging/hv/vmbus_drv.c

+3 −12
Original line number Diff line number Diff line
@@ -552,8 +552,7 @@ static int vmbus_bus_init(int irq) 
	}



	/* Get the interrupt resource */

	ret = request_irq(irq, vmbus_isr,

			  IRQF_SHARED | IRQF_SAMPLE_RANDOM,

	ret = request_irq(irq, vmbus_isr, IRQF_SAMPLE_RANDOM,

			driver_name, hv_pci_dev);



	if (ret != 0) {
@@ -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);