From patchwork Fri Jul 31 21:36:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 38599 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6VLab3v017169 for ; Fri, 31 Jul 2009 21:37:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753125AbZGaVhB (ORCPT ); Fri, 31 Jul 2009 17:37:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753144AbZGaVhA (ORCPT ); Fri, 31 Jul 2009 17:37:00 -0400 Received: from g4t0015.houston.hp.com ([15.201.24.18]:15966 "EHLO g4t0015.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753125AbZGaVg7 (ORCPT ); Fri, 31 Jul 2009 17:36:59 -0400 Received: from g4t0009.houston.hp.com (g4t0009.houston.hp.com [16.234.32.26]) by g4t0015.houston.hp.com (Postfix) with ESMTP id B9763813E; Fri, 31 Jul 2009 21:37:00 +0000 (UTC) Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30]) by g4t0009.houston.hp.com (Postfix) with ESMTP id A93281C023; Fri, 31 Jul 2009 21:37:00 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl.fc.hp.com (Postfix) with ESMTP id 60F0239C009; Fri, 31 Jul 2009 15:37:00 -0600 (MDT) X-Virus-Scanned: Debian amavisd-new at ldl.fc.hp.com Received: from ldl.fc.hp.com ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3KzJrMN69V4G; Fri, 31 Jul 2009 15:36:59 -0600 (MDT) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl.fc.hp.com (Postfix) with ESMTP id 08DC939C003; Fri, 31 Jul 2009 15:36:59 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id F028A26169; Fri, 31 Jul 2009 15:36:58 -0600 (MDT) Subject: [PATCH 05/19] ACPI: remove unused acpi_bus_scan_fixed() argument To: Len Brown From: Bjorn Helgaas Cc: linux-acpi@vger.kernel.org Date: Fri, 31 Jul 2009 15:36:58 -0600 Message-ID: <20090731213658.29930.50331.stgit@bob.kio> In-Reply-To: <20090731213501.29930.39957.stgit@bob.kio> References: <20090731213501.29930.39957.stgit@bob.kio> User-Agent: StGit/0.14.3.386.gb02d MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org We never use the "root" argument, so just remove it. Signed-off-by: Bjorn Helgaas --- drivers/acpi/scan.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 92b4fe2..091d967 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1537,15 +1537,12 @@ int acpi_bus_trim(struct acpi_device *start, int rmdevice) } EXPORT_SYMBOL_GPL(acpi_bus_trim); -static int acpi_bus_scan_fixed(struct acpi_device *root) +static int acpi_bus_scan_fixed(void) { int result = 0; struct acpi_device *device = NULL; struct acpi_bus_ops ops; - if (!root) - return -ENODEV; - memset(&ops, 0, sizeof(ops)); ops.acpi_op_add = 1; ops.acpi_op_start = 1; @@ -1596,7 +1593,7 @@ int __init acpi_scan_init(void) /* * Enumerate devices in the ACPI namespace. */ - result = acpi_bus_scan_fixed(acpi_root); + result = acpi_bus_scan_fixed(); if (!result) result = acpi_bus_scan(acpi_root, &ops);