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

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

Drivers: hv: vmbus: Get rid of the unused irq variable 



The irq we extract from ACPI is not used - we deliver hypervisor
interrupts on a special vector. Make the necessary adjustments.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90e031fa

drivers/hv/vmbus_drv.c

+3 −13
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ static struct acpi_device *hv_acpi_dev; 


static struct tasklet_struct msg_dpc;

static struct completion probe_event;

static int irq;





static void hyperv_report_panic(struct pt_regs *regs)
@@ -835,10 +834,9 @@ static void vmbus_isr(void) 
 * Here, we

 *	- initialize the vmbus driver context

 *	- invoke the vmbus hv main init routine

 *	- get the irq resource

 *	- retrieve the channel offers

 */

static int vmbus_bus_init(int irq)

static int vmbus_bus_init(void)

{

	int ret;
@@ -1033,9 +1031,6 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx) 
	struct resource **prev_res = NULL;



	switch (res->type) {

	case ACPI_RESOURCE_TYPE_IRQ:

		irq = res->data.irq.interrupts[0];

		return AE_OK;



	/*

	 * "Address" descriptors are for bus windows. Ignore
@@ -1294,7 +1289,7 @@ static int __init hv_acpi_init(void) 
	init_completion(&probe_event);



	/*

	 * Get irq resources first.

	 * Get ACPI resources first.

	 */

	ret = acpi_bus_register_driver(&vmbus_acpi_driver);
@@ -1307,12 +1302,7 @@ static int __init hv_acpi_init(void) 
		goto cleanup;

	}



	if (irq <= 0) {

		ret = -ENODEV;

		goto cleanup;

	}



	ret = vmbus_bus_init(irq);

	ret = vmbus_bus_init();

	if (ret)

		goto cleanup;