From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757649AbbCCU7T (ORCPT ); Tue, 3 Mar 2015 15:59:19 -0500 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:39512 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756893AbbCCU7Q (ORCPT ); Tue, 3 Mar 2015 15:59:16 -0500 x-originating-ip: 72.167.245.219 From: Jake Oshins To: gregkh@linuxfoundation.org, kys@microsoft.com, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, rjw@rjwysocki.net, arjan@linux.intel.com Cc: Jake Oshins Subject: [PATCH v2 3/3] drivers:hv Remove old MMIO management code Date: Tue, 3 Mar 2015 14:14:29 -0800 Message-Id: <1425420869-12750-4-git-send-email-jakeo@microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1425420869-12750-1-git-send-email-jakeo@microsoft.com> References: <1425420869-12750-1-git-send-email-jakeo@microsoft.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch removes the now-redundant code which examined the ACPI namespace directly for memory-mapped I/O regions for its children. Signed-off-by: Jake Oshins --- drivers/hv/vmbus_drv.c | 28 ++-------------------------- include/linux/hyperv.h | 2 -- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 7783f4c..193a362 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -44,12 +44,6 @@ static struct tasklet_struct msg_dpc; static struct completion probe_event; static int irq; -struct resource hyperv_mmio = { - .name = "hyperv mmio", - .flags = IORESOURCE_MEM, -}; -EXPORT_SYMBOL_GPL(hyperv_mmio); - static int vmbus_exists(void) { if (hv_acpi_dev == NULL) @@ -899,11 +893,6 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx) case ACPI_RESOURCE_TYPE_IRQ: irq = res->data.irq.interrupts[0]; break; - - case ACPI_RESOURCE_TYPE_ADDRESS64: - hyperv_mmio.start = res->data.address64.address.minimum; - hyperv_mmio.end = res->data.address64.address.maximum; - break; } return AE_OK; @@ -917,24 +906,11 @@ static int vmbus_acpi_add(struct acpi_device *device) hv_acpi_dev = device; result = acpi_walk_resources(device->handle, METHOD_NAME__CRS, - vmbus_walk_resources, NULL); + vmbus_walk_resources, NULL); if (ACPI_FAILURE(result)) goto acpi_walk_err; - /* - * The parent of the vmbus acpi device (Gen2 firmware) is the VMOD that - * has the mmio ranges. Get that. - */ - if (device->parent) { - result = acpi_walk_resources(device->parent->handle, - METHOD_NAME__CRS, - vmbus_walk_resources, NULL); - - if (ACPI_FAILURE(result)) - goto acpi_walk_err; - if (hyperv_mmio.start && hyperv_mmio.end) - request_resource(&iomem_resource, &hyperv_mmio); - } + ret_val = 0; acpi_walk_err: diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 796cc32..993ea5f 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1221,8 +1221,6 @@ int hv_vss_init(struct hv_util_service *); void hv_vss_deinit(void); void hv_vss_onchannelcallback(void *); -extern struct resource hyperv_mmio; - /* * Negotiated version with the Host. */ -- 1.9.1