Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761332AbYFESYR (ORCPT ); Thu, 5 Jun 2008 14:24:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753970AbYFESYI (ORCPT ); Thu, 5 Jun 2008 14:24:08 -0400 Received: from smtp6.pp.htv.fi ([213.243.153.40]:55528 "EHLO smtp6.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753944AbYFESYH (ORCPT ); Thu, 5 Jun 2008 14:24:07 -0400 Date: Thu, 5 Jun 2008 21:23:28 +0300 From: Adrian Bunk To: linux-kernel@vger.kernel.org Cc: "Robert P. J. Day" , Andrew Morton , Pavel Machek , "Rafael J. Wysocki" , rmk@arm.linux.org.uk Subject: [2.6 patch] remove include/linux/pm_legacy.h Message-ID: <20080605182311.GC1469@cs181133002.pp.htv.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2748 Lines: 100 This patch removes the obsolete and no longer used include/linux/pm_legacy.h Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk --- BTW: arch/arm/mach-sa1100/h3600.c:h3800_pm_callback() still tries to handle PM_{SUSPEND,RESUME}, but that's not touched by this patch. arch/frv/kernel/pm.c | 1 arch/mips/au1000/common/power.c | 1 arch/x86/kernel/apm_32.c | 1 include/linux/pm_legacy.h | 35 -------------------------------- 4 files changed, 38 deletions(-) b72cb105a5c8e961825b6ec9558c7c7ab4c18070 diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c index 73f3aee..d1113c5 100644 --- a/arch/frv/kernel/pm.c +++ b/arch/frv/kernel/pm.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c index 2166b9e..bd854a6 100644 --- a/arch/mips/au1000/common/power.c +++ b/arch/mips/au1000/common/power.c @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index bf9290e..fa1f3be 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -218,7 +218,6 @@ #include #include #include -#include #include #include #include diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h deleted file mode 100644 index 446f4f4..0000000 --- a/include/linux/pm_legacy.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef __LINUX_PM_LEGACY_H__ -#define __LINUX_PM_LEGACY_H__ - - -#ifdef CONFIG_PM_LEGACY - -/* - * Register a device with power management - */ -struct pm_dev __deprecated * -pm_register(pm_dev_t type, unsigned long id, pm_callback callback); - -/* - * Send a request to all devices - */ -int __deprecated pm_send_all(pm_request_t rqst, void *data); - -#else /* CONFIG_PM_LEGACY */ - -static inline struct pm_dev *pm_register(pm_dev_t type, - unsigned long id, - pm_callback callback) -{ - return NULL; -} - -static inline int pm_send_all(pm_request_t rqst, void *data) -{ - return 0; -} - -#endif /* CONFIG_PM_LEGACY */ - -#endif /* __LINUX_PM_LEGACY_H__ */ - -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/