From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark gross Subject: Re: [PATCH 1/6] PM QoS: Simplify PM QoS expansion/merge Date: Fri, 6 Jan 2012 07:24:30 -0800 Message-ID: <20120106152430.GD12530@mgross-G62> References: <1325810186-28986-1-git-send-email-amiettinen@nvidia.com> <1325810186-28986-2-git-send-email-amiettinen@nvidia.com> Reply-To: markgross@thegnar.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1325810186-28986-2-git-send-email-amiettinen@nvidia.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: Antti P Miettinen Cc: linux-pm@lists.linux-foundation.org, Alex Frid List-Id: linux-pm@vger.kernel.org Acked-by: markgross On Fri, Jan 06, 2012 at 02:36:21AM +0200, Antti P Miettinen wrote: > From: Alex Frid > > - Replace class ID #define with enumeration > - Loop through PM QoS objects during initialization (rather than > initializing them one-by-one) > > Signed-off-by: Alex Frid > Reviewed-by: Antti Miettinen > Reviewed-by: Diwakar Tundlam > Reviewed-by: Scott Williams > Reviewed-by: Yu-Huan Hsu > --- > include/linux/pm_qos.h | 14 +++++++++----- > kernel/power/qos.c | 23 ++++++++++------------- > 2 files changed, 19 insertions(+), 18 deletions(-) > > diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h > index e5bbcba..5ac91d8 100644 > --- a/include/linux/pm_qos.h > +++ b/include/linux/pm_qos.h > @@ -9,12 +9,16 @@ > #include > #include > > -#define PM_QOS_RESERVED 0 > -#define PM_QOS_CPU_DMA_LATENCY 1 > -#define PM_QOS_NETWORK_LATENCY 2 > -#define PM_QOS_NETWORK_THROUGHPUT 3 > +enum { > + PM_QOS_RESERVED = 0, > + PM_QOS_CPU_DMA_LATENCY, > + PM_QOS_NETWORK_LATENCY, > + PM_QOS_NETWORK_THROUGHPUT, > + > + /* insert new class ID */ > + PM_QOS_NUM_CLASSES, > +}; > > -#define PM_QOS_NUM_CLASSES 4 > #define PM_QOS_DEFAULT_VALUE -1 > > #define PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC) > diff --git a/kernel/power/qos.c b/kernel/power/qos.c > index 995e3bd..d6d6dbd 100644 > --- a/kernel/power/qos.c > +++ b/kernel/power/qos.c > @@ -469,21 +469,18 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, > static int __init pm_qos_power_init(void) > { > int ret = 0; > + int i; > > - ret = register_pm_qos_misc(&cpu_dma_pm_qos); > - if (ret < 0) { > - printk(KERN_ERR "pm_qos_param: cpu_dma_latency setup failed\n"); > - return ret; > - } > - ret = register_pm_qos_misc(&network_lat_pm_qos); > - if (ret < 0) { > - printk(KERN_ERR "pm_qos_param: network_latency setup failed\n"); > - return ret; > + BUILD_BUG_ON(ARRAY_SIZE(pm_qos_array) != PM_QOS_NUM_CLASSES); > + > + for (i = 1; i < PM_QOS_NUM_CLASSES; i++) { > + ret = register_pm_qos_misc(pm_qos_array[i]); > + if (ret < 0) { > + printk(KERN_ERR "pm_qos_param: %s setup failed\n", > + pm_qos_array[i]->name); > + return ret; > + } > } > - ret = register_pm_qos_misc(&network_throughput_pm_qos); > - if (ret < 0) > - printk(KERN_ERR > - "pm_qos_param: network_throughput setup failed\n"); > > return ret; > } > -- > 1.7.4.1 > > _______________________________________________ > linux-pm mailing list > linux-pm@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/linux-pm