From patchwork Tue Mar 24 16:55:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 14072 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 n2OGtV5I007559 for ; Tue, 24 Mar 2009 16:55:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761189AbZCXQzd (ORCPT ); Tue, 24 Mar 2009 12:55:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755974AbZCXQzc (ORCPT ); Tue, 24 Mar 2009 12:55:32 -0400 Received: from g4t0017.houston.hp.com ([15.201.24.20]:46038 "EHLO g4t0017.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762634AbZCXQz3 (ORCPT ); Tue, 24 Mar 2009 12:55:29 -0400 Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127]) by g4t0017.houston.hp.com (Postfix) with ESMTP id 3C59F38429; Tue, 24 Mar 2009 16:55:28 +0000 (UTC) Received: from localhost.localdomain (lart.fc.hp.com [15.11.146.31]) by smtp1.fc.hp.com (Postfix) with ESMTP id 6F8DD24BF34; Tue, 24 Mar 2009 16:26:31 +0000 (UTC) Received: from bob.kio (localhost [127.0.0.1]) by localhost.localdomain (Postfix) with ESMTP id E7DE92614B; Tue, 24 Mar 2009 10:55:27 -0600 (MDT) From: Bjorn Helgaas Subject: [PATCH 2/3] ACPI: remove unused acpi_device_ops .shutdown method To: Len Brown Cc: linux-acpi@vger.kernel.org, Li Shaohua , Rajesh Shah Date: Tue, 24 Mar 2009 10:55:27 -0600 Message-ID: <20090324165527.25119.52477.stgit@bob.kio> In-Reply-To: <20090324165420.25119.78955.stgit@bob.kio> References: <20090324165420.25119.78955.stgit@bob.kio> User-Agent: StGIT/0.14.3.215.gff3d MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org No drivers use the .shutdown method, so remove it. Signed-off-by: Bjorn Helgaas --- drivers/acpi/scan.c | 12 ------------ include/acpi/acpi_bus.h | 2 -- 2 files changed, 0 insertions(+), 14 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 2f04cd1..467e9d0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -397,22 +397,10 @@ static int acpi_device_remove(struct device * dev) return 0; } -static void acpi_device_shutdown(struct device *dev) -{ - struct acpi_device *acpi_dev = to_acpi_device(dev); - struct acpi_driver *acpi_drv = acpi_dev->driver; - - if (acpi_drv && acpi_drv->ops.shutdown) - acpi_drv->ops.shutdown(acpi_dev); - - return ; -} - struct bus_type acpi_bus_type = { .name = "acpi", .suspend = acpi_device_suspend, .resume = acpi_device_resume, - .shutdown = acpi_device_shutdown, .match = acpi_bus_match, .probe = acpi_device_probe, .remove = acpi_device_remove, diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index e3c5a4e..fb91bc2 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -95,7 +95,6 @@ typedef int (*acpi_op_suspend) (struct acpi_device * device, typedef int (*acpi_op_resume) (struct acpi_device * device); typedef int (*acpi_op_bind) (struct acpi_device * device); typedef int (*acpi_op_unbind) (struct acpi_device * device); -typedef int (*acpi_op_shutdown) (struct acpi_device * device); struct acpi_bus_ops { u32 acpi_op_add:1; @@ -121,7 +120,6 @@ struct acpi_device_ops { acpi_op_resume resume; acpi_op_bind bind; acpi_op_unbind unbind; - acpi_op_shutdown shutdown; }; struct acpi_driver {