From patchwork Tue Nov 6 19:52:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rientjes X-Patchwork-Id: 1706451 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D3483DFE75 for ; Tue, 6 Nov 2012 19:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751300Ab2KFTxL (ORCPT ); Tue, 6 Nov 2012 14:53:11 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:46207 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752651Ab2KFTwp (ORCPT ); Tue, 6 Nov 2012 14:52:45 -0500 Received: by mail-pa0-f46.google.com with SMTP id hz1so572715pad.19 for ; Tue, 06 Nov 2012 11:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type; bh=HZE1ioGTY9N6o45dd0h74Lc/M29fjvggNyQ69wzZmZo=; b=Smw7s6/NiOKMQrzPuotICg01QlSqsJOthWkUYAQWQ5I8UOxxFLLGgf/7hOqf/XJCO+ iKwtLoo/yYDuazJmLbCNp8iFE+sVZS1P7+YRAgYhHLS575MTZfsEt2khb3YG1SsQXfgn HPBaUjV5+RebWP//usnsTmXMJdpdbHQG6f4r7d9iSd/waoNbxNgCw1R5R3/FtN8AvmUy TnVOCJ/DdqxPjfglcoAff8DqR+2PzIVcoP3suMZveUgUa9Qfbopauatl0iikXdn6ufKw HGBFsSvXjtRBu6Haj546OnVr1NO8r/SNesr+nw4BANSN5XVHodRiKkJQUZ1arp7xoXFo vt3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type:x-gm-message-state; bh=HZE1ioGTY9N6o45dd0h74Lc/M29fjvggNyQ69wzZmZo=; b=VapUDnySyWURwGRj7f6taj7zJDZnDwSNnvJY81hAouSBy/4LJ3I4KB7U4WPA6765/G obluKEBti/QB5AppYTlOS3OuO/iNqubHt1sEFogT60BQEVxX7zgz/y23Je7TQexd/Chc jvO+qoF84fEXRnHRQlsQLYMk3IySl7DLNtolVSNnGrz9mCUlzm3ed5rBgNaHolApvR4g UHiolOjqreOzih9srsJRFI5fobKTU9EdLoQ5l1kDIcPH9TMF/6JEx1048BUuSrUM/e2Y 6w4xz7BxCFogvwxpjeYuhDSJ1lxGwOCJFh4ggaO+n5k3A4qPQyBrc8RcxD4xdk8+Gq2i neRw== Received: by 10.66.87.133 with SMTP id ay5mr5486441pab.59.1352231564685; Tue, 06 Nov 2012 11:52:44 -0800 (PST) Received: from [2620:0:1008:1101:be30:5bff:fed8:5e64] ([2620:0:1008:1101:be30:5bff:fed8:5e64]) by mx.google.com with ESMTPS id rk17sm1402210pbb.3.2012.11.06.11.52.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Nov 2012 11:52:43 -0800 (PST) Date: Tue, 6 Nov 2012 11:52:42 -0800 (PST) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: "Rafael J. Wysocki" cc: Aaron Lu , Huang Ying , Len Brown , Lv Zheng , Adrian Hunter , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org Subject: Re: [PATCH 6/7] ACPI / PM: Move device PM functions related to sleep states In-Reply-To: <1456107.KxymqUQLId@vostro.rjw.lan> Message-ID: References: <1766582.8gdQKXoi0K@vostro.rjw.lan> <1456107.KxymqUQLId@vostro.rjw.lan> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmUEetFx01Uw6X+TQ01sfYcN453deD8uetApbknWVc9L3AjoCCq+sbJF54nKxu/aYkd+76KZBmhOqPD883pZWMvrTX2tFDlPj3miQKTeQwjn406paCc4sq+TuJB6BbabhnnDHFpJh3k7BL4wkydZPjGERJ799evKym7TSTHDt3Oly7I4n3bKUIwdxg0cG5l1je0/1pT Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Commit b87b49cd0efd ("ACPI / PM: Move device PM functions related to sleep states") declared acpi_target_system_state() for CONFIG_PM_SLEEP whereas it is only defined for CONFIG_ACPI_SLEEP, resulting in the following link error: drivers/built-in.o: In function `acpi_pm_device_sleep_wake': drivers/acpi/device_pm.c:342: undefined reference to `acpi_target_system_state' drivers/built-in.o: In function `acpi_dev_suspend_late': drivers/acpi/device_pm.c:501: undefined reference to `acpi_target_system_state' drivers/built-in.o: In function `acpi_pm_device_sleep_state': drivers/acpi/device_pm.c:221: undefined reference to `acpi_target_system_state' Define it only for CONFIG_ACPI_SLEEP and fallback to a dummy definition for other configs. Signed-off-by: David Rientjes --- include/acpi/acpi_bus.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" 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/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -469,11 +469,9 @@ static inline int acpi_pm_device_run_wake(struct device *dev, bool enable) #endif #ifdef CONFIG_PM_SLEEP -u32 acpi_target_system_state(void); int __acpi_device_sleep_wake(struct acpi_device *, u32, bool); int acpi_pm_device_sleep_wake(struct device *, bool); #else -static inline u32 acpi_target_system_state(void) { return ACPI_STATE_S0; } static inline int __acpi_device_sleep_wake(struct acpi_device *adev, u32 target_state, bool enable) { @@ -485,6 +483,12 @@ static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable) } #endif +#ifdef CONFIG_ACPI_SLEEP +u32 acpi_target_system_state(void); +#else +static inline u32 acpi_target_system_state(void) { return ACPI_STATE_S0; } +#endif + static inline bool acpi_device_power_manageable(struct acpi_device *adev) { return adev->flags.power_manageable;