From patchwork Thu Jun 13 16:32:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 251108 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0D9812C0098 for ; Fri, 14 Jun 2013 02:36:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758775Ab3FMQfr (ORCPT ); Thu, 13 Jun 2013 12:35:47 -0400 Received: from mail-pb0-f52.google.com ([209.85.160.52]:36405 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758736Ab3FMQfp (ORCPT ); Thu, 13 Jun 2013 12:35:45 -0400 Received: by mail-pb0-f52.google.com with SMTP id xa12so10554194pbc.11 for ; Thu, 13 Jun 2013 09:35:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=y66AchTXfCftgPBZoxFRx3K5H1uyoSvBvikABFn6qxs=; b=sFpjgjm1532zRp5E8N87Z17TC2FPSS4LBjDfojMa9PV9ZfKz6aAuOHBA1VyfTQI46+ ZvPzZMXVMm83WBBzObhL9hP5DGxZ1V61nl4477pWEcv+uZbqFLsUU0zAYcwtCG2js/VZ 7pbuu1ErJBIvKVT/ZvNw8+l5ljvFOpiWY+zLfkxIP4eAw4G+DbayTBG4IaQj6tFmu+rC gN6eYm9z9Wb3xzb6SOze/+oj/JLTOyicYxa/WbxrT0wCuHeydPDwE1RF0PBrQEyaoiwB dkczhY7olFLO+vHIblaLqf4KmxrwRWXpLkGiHhJnOuInqwRd3NLWVd0USuv3Ri6MAT/2 u27w== X-Received: by 10.68.233.98 with SMTP id tv2mr1577483pbc.146.1371141345262; Thu, 13 Jun 2013 09:35:45 -0700 (PDT) Received: from localhost.localdomain ([114.250.95.159]) by mx.google.com with ESMTPSA id ty8sm176964pac.8.2013.06.13.09.35.40 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 09:35:44 -0700 (PDT) From: Jiang Liu To: "Rafael J . Wysocki" , Bjorn Helgaas , Yinghai Lu , "Alexander E . Patrakov" Cc: Jiang Liu , Greg Kroah-Hartman , Yijing Wang , Jiang Liu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Shaohua Li , Len Brown , linux-acpi@vger.kernel.org Subject: [BUGFIX 6/9] ACPI, DOCK: mark initialization functions with __init Date: Fri, 14 Jun 2013 00:32:29 +0800 Message-Id: <1371141152-9468-7-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1371141152-9468-1-git-send-email-jiang.liu@huawei.com> References: <1371141152-9468-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Mark all initialization functions with __init to reduce memory consumption at runtime. Signed-off-by: Jiang Liu Cc: Shaohua Li Cc: Len Brown Cc: "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/acpi/dock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index cd2d5df..da3314d 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -94,7 +94,7 @@ struct dock_dependent_device { * * Add the dependent device to the dock's dependent device list. */ -static int +static int __init add_dock_dependent_device(struct dock_station *ds, acpi_handle handle) { struct dock_dependent_device *dd; @@ -192,7 +192,7 @@ static int is_dock(acpi_handle handle) return 1; } -static int is_ejectable(acpi_handle handle) +static int __init is_ejectable(acpi_handle handle) { acpi_status status; acpi_handle tmp; @@ -203,7 +203,7 @@ static int is_ejectable(acpi_handle handle) return 1; } -static int is_ata(acpi_handle handle) +static int __init is_ata(acpi_handle handle) { acpi_handle tmp; @@ -216,7 +216,7 @@ static int is_ata(acpi_handle handle) return 0; } -static int is_battery(acpi_handle handle) +static int __init is_battery(acpi_handle handle) { struct acpi_device_info *info; int ret = 1; @@ -232,7 +232,7 @@ static int is_battery(acpi_handle handle) return ret; } -static int is_ejectable_bay(acpi_handle handle) +static int __init is_ejectable_bay(acpi_handle handle) { acpi_handle phandle; @@ -809,7 +809,7 @@ static struct notifier_block dock_acpi_notifier = { * check to see if an object has an _EJD method. If it does, then it * will see if it is dependent on the dock station. */ -static acpi_status +static acpi_status __init find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv) { acpi_status status;