Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
K. Y. Srinivasan 2015-12-14 16:01:46 -08:00 committed by Greg Kroah-Hartman
parent 90e031fa06
commit efc267226b
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/hv/vmbus_drv.c
View file

@ -47,7 +47,6 @@ static struct acpi_device *hv_acpi_dev;
static struct tasklet_struct msg_dpc; static struct tasklet_struct msg_dpc;
static struct completion probe_event; static struct completion probe_event;
static int irq;
static void hyperv_report_panic(struct pt_regs *regs) static void hyperv_report_panic(struct pt_regs *regs)
@ -835,10 +834,9 @@ static void vmbus_isr(void)
* Here, we * Here, we
* - initialize the vmbus driver context * - initialize the vmbus driver context
* - invoke the vmbus hv main init routine * - invoke the vmbus hv main init routine
* - get the irq resource
* - retrieve the channel offers * - retrieve the channel offers
*/ */
static int vmbus_bus_init(int irq) static int vmbus_bus_init(void)
{ {
int ret; int ret;
@ -1033,9 +1031,6 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx)
struct resource **prev_res = NULL; struct resource **prev_res = NULL;
switch (res->type) { switch (res->type) {
case ACPI_RESOURCE_TYPE_IRQ:
irq = res->data.irq.interrupts[0];
return AE_OK;
/* /*
* "Address" descriptors are for bus windows. Ignore * "Address" descriptors are for bus windows. Ignore
@ -1294,7 +1289,7 @@ static int __init hv_acpi_init(void)
init_completion(&probe_event); init_completion(&probe_event);
/* /*
* Get irq resources first. * Get ACPI resources first.
*/ */
ret = acpi_bus_register_driver(&vmbus_acpi_driver); ret = acpi_bus_register_driver(&vmbus_acpi_driver);
@ -1307,12 +1302,7 @@ static int __init hv_acpi_init(void)
goto cleanup; goto cleanup;
} }
if (irq <= 0) { ret = vmbus_bus_init();
ret = -ENODEV;
goto cleanup;
}
ret = vmbus_bus_init(irq);
if (ret) if (ret)
goto cleanup; goto cleanup;