Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755423Ab2BLCIB (ORCPT ); Sat, 11 Feb 2012 21:08:01 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:38345 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754986Ab2BLCIA (ORCPT ); Sat, 11 Feb 2012 21:08:00 -0500 Date: Sat, 11 Feb 2012 18:07:57 -0800 From: mark gross To: Jean Pihet Cc: Linux PM mailing list , linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Mark Gross , Venkatesh Pallipadi , Jean Pihet Subject: Re: [PATCH 2/2] PM / QoS: unconditionally build the per-device constraints feature Message-ID: <20120212020757.GF18742@gs62> Reply-To: markgross@thegnar.org References: <1328603646-2714-1-git-send-email-j-pihet@ti.com> <1328603646-2714-3-git-send-email-j-pihet@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1328603646-2714-3-git-send-email-j-pihet@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3685 Lines: 96 why are these two patches? I think you could squash them into one and it would be just fine. --mark On Tue, Feb 07, 2012 at 09:34:06AM +0100, Jean Pihet wrote: > The per-device PM QoS feature depends on CONFIG_PM which depends > on PM_SLEEP || PM_RUNTIME. This breaks CPU C-states with kernels > not having these CONFIGs. > > This patch allows the feature in all cases. > > Signed-off-by: Jean Pihet > Cc: Rafael J. Wysocki > Cc: Mark Gross > --- > drivers/base/power/Makefile | 3 ++- > include/linux/pm_qos.h | 39 --------------------------------------- > 2 files changed, 2 insertions(+), 40 deletions(-) > > diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile > index 2e58ebb..312eb65 100644 > --- a/drivers/base/power/Makefile > +++ b/drivers/base/power/Makefile > @@ -1,4 +1,5 @@ > -obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o > +obj-y += qos.o > +obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o > obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o > obj-$(CONFIG_PM_RUNTIME) += runtime.o > obj-$(CONFIG_PM_TRACE_RTC) += trace.o > diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h > index 105be69..37b017a 100644 > --- a/include/linux/pm_qos.h > +++ b/include/linux/pm_qos.h > @@ -77,7 +77,6 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier); > int pm_qos_request_active(struct pm_qos_request *req); > s32 pm_qos_read_value(struct pm_qos_constraints *c); > > -#ifdef CONFIG_PM > s32 __dev_pm_qos_read_value(struct device *dev); > s32 dev_pm_qos_read_value(struct device *dev); > int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req, > @@ -94,43 +93,5 @@ void dev_pm_qos_constraints_init(struct device *dev); > void dev_pm_qos_constraints_destroy(struct device *dev); > int dev_pm_qos_add_ancestor_request(struct device *dev, > struct dev_pm_qos_request *req, s32 value); > -#else > -static inline s32 __dev_pm_qos_read_value(struct device *dev) > - { return 0; } > -static inline s32 dev_pm_qos_read_value(struct device *dev) > - { return 0; } > -static inline int dev_pm_qos_add_request(struct device *dev, > - struct dev_pm_qos_request *req, > - s32 value) > - { return 0; } > -static inline int dev_pm_qos_update_request(struct dev_pm_qos_request *req, > - s32 new_value) > - { return 0; } > -static inline int dev_pm_qos_remove_request(struct dev_pm_qos_request *req) > - { return 0; } > -static inline int dev_pm_qos_add_notifier(struct device *dev, > - struct notifier_block *notifier) > - { return 0; } > -static inline int dev_pm_qos_remove_notifier(struct device *dev, > - struct notifier_block *notifier) > - { return 0; } > -static inline int dev_pm_qos_add_global_notifier( > - struct notifier_block *notifier) > - { return 0; } > -static inline int dev_pm_qos_remove_global_notifier( > - struct notifier_block *notifier) > - { return 0; } > -static inline void dev_pm_qos_constraints_init(struct device *dev) > -{ > - dev->power.power_state = PMSG_ON; > -} > -static inline void dev_pm_qos_constraints_destroy(struct device *dev) > -{ > - dev->power.power_state = PMSG_INVALID; > -} > -static inline int dev_pm_qos_add_ancestor_request(struct device *dev, > - struct dev_pm_qos_request *req, s32 value) > - { return 0; } > -#endif > > #endif > -- > 1.7.5.4 > -- 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/