From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932969AbbLNWge (ORCPT ); Mon, 14 Dec 2015 17:36:34 -0500 Received: from p3plsmtps2ded03.prod.phx3.secureserver.net ([208.109.80.60]:55374 "EHLO p3plsmtps2ded03.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753632AbbLNW2X (ORCPT ); Mon, 14 Dec 2015 17:28:23 -0500 x-originating-ip: 72.167.245.219 From: "K. Y. Srinivasan" To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com Cc: "K. Y. Srinivasan" Subject: [PATCH RESEND 15/27] Drivers: hv: vmbus: Get rid of the unused irq variable Date: Mon, 14 Dec 2015 16:01:46 -0800 Message-Id: <1450137718-26366-15-git-send-email-kys@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1450137718-26366-1-git-send-email-kys@microsoft.com> References: <1450137698-26327-1-git-send-email-kys@microsoft.com> <1450137718-26366-1-git-send-email-kys@microsoft.com> X-CMAE-Envelope: MS4wfKWS+k/TzIRqqUgOZajQz4GeoVM+oEN+UwL+BfVsGJqlcf6laA94VDr/XsqfuzCgAnOuqec7lTWXJBtHSgka4oDlLbaabkXAiuFYG42TdfFawgPdHkfF Wt0ZjYGBxnWrj5DNu/8iThn/ayBCF52DGoCYg0tVtETlG1pwygeoDezYd8oFbTrJ3PYhd39iuHObNq3Gz/fXQtj0IXe5OoS7+wRvTXZ8z6BHaD+qq8iLNXd8 50+qjHBwg+M24l2h0l0Fe/cUrhFEYijrx2D2vgYMrzFQWGy5Uo5J33YGzC8YsI3MUBAlNouyzmzcBHLiC8UBuaHATwm2qhOVth83fNrlZAlz5knh+/M1f/pE 0u7GYvl7/8TVgObltShLKy+6dHu4Wb9hPRXK54hnd0U1vfqTlh86KD+/EwMolbgW1hb0qupK Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/hv/vmbus_drv.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 9e0e25c..ab888a1 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -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; -- 1.7.4.1