From patchwork Fri Apr 26 21:21:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 2496001 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5AFFB3FD40 for ; Fri, 26 Apr 2013 21:21:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752430Ab3DZVVP (ORCPT ); Fri, 26 Apr 2013 17:21:15 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:42714 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751566Ab3DZVVO (ORCPT ); Fri, 26 Apr 2013 17:21:14 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r3QLLAfb027885; Fri, 26 Apr 2013 16:21:10 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r3QLLASP007840; Fri, 26 Apr 2013 16:21:10 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Fri, 26 Apr 2013 16:21:10 -0500 Received: from [172.24.68.15] (h68-15.vpn.ti.com [172.24.68.15]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r3QLL6iO031291; Fri, 26 Apr 2013 16:21:08 -0500 Message-ID: <517AEFC0.2010301@ti.com> Date: Fri, 26 Apr 2013 17:21:04 -0400 From: Eduardo Valentin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Srinivas Pandruvada CC: , , , Subject: Re: [PATCH] thermal: Can't set policy References: <1367008557-12443-1-git-send-email-srinivas.pandruvada@linux.intel.com> In-Reply-To: <1367008557-12443-1-git-send-email-srinivas.pandruvada@linux.intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Hello Srinivas, On 26-04-2013 16:35, Srinivas Pandruvada wrote: > Setting policy results in invalid value error. > >echo "step_wise" > policy > >echo: write error: Invalid argument > > Need clean up of the buffer which "echo" may add based on the > arguments, before comparing aganist list of governor names. > > Signed-off-by: Srinivas Pandruvada > --- > drivers/thermal/thermal_core.c | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 4cdc3e3..ed6904f 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -696,16 +696,27 @@ static ssize_t > policy_store(struct device *dev, struct device_attribute *attr, > const char *buf, size_t count) > { > - int ret = -EINVAL; > + int ret; > struct thermal_zone_device *tz = to_thermal_zone(dev); > struct thermal_governor *gov; > + char str_gov[THERMAL_NAME_LENGTH]; > + char format[6]; /* enough for 3 digit format width */ > + > + ret = snprintf(format, sizeof(format), "%%%ds", > + THERMAL_NAME_LENGTH - 1); > + if (ret < 0) > + return ret; > + ret = sscanf(buf, format, str_gov); > + if (ret <= 0) > + return -EINVAL; Is this due to trainling \n? Why not using sysfs_streq()? I believe it is better approach. Can you please check if the following solves the issue? https://gitorious.org/thermal-framework/thermal-framework/commit/810a33a629b40adfa92a164883281bbdfad80516 commit 810a33a629b40adfa92a164883281bbdfad80516 Author: Eduardo Valentin Date: Fri Apr 26 17:12:30 2013 -0400 thermal: better string treatment while finding governors To avoid returning error value just because of trailing \n, this patch changes the function to find governors by name to use sysfs_streq(). Signed-off-by: Eduardo Valentin return NULL; > > mutex_lock(&thermal_governor_lock); > > - gov = __find_governor(buf); > - if (!gov) > + gov = __find_governor(str_gov); > + if (!gov) { > + ret = -EINVAL; > goto exit; > - > + } > tz->governor = gov; > ret = count; > > --- 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/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index f36cd44..08ea62c 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -58,7 +58,7 @@ static struct thermal_governor *__find_governor(const char *name) struct thermal_governor *pos; list_for_each_entry(pos, &thermal_governor_list, governor_list) - if (!strnicmp(name, pos->name, THERMAL_NAME_LENGTH)) + if (sysfs_streq(name, pos->name)) return pos;