Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933176AbZAPANx (ORCPT ); Thu, 15 Jan 2009 19:13:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756362AbZAPANQ (ORCPT ); Thu, 15 Jan 2009 19:13:16 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:39843 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755683AbZAPANN (ORCPT ); Thu, 15 Jan 2009 19:13:13 -0500 Date: Thu, 15 Jan 2009 16:13:01 -0800 From: Andrew Morton To: david-b@pacbell.net, broonie@opensource.wolfsonmicro.com, lrg@slimlogic.co.uk, linux-kernel@vger.kernel.org Subject: Re: [patch 2.6.29-rc] regulator: minor cleanup of virtual consumer Message-Id: <20090115161301.c74a071b.akpm@linux-foundation.org> In-Reply-To: <20090115161022.2b11ed41.akpm@linux-foundation.org> References: <200901141316.27584.david-b@pacbell.net> <20090115161022.2b11ed41.akpm@linux-foundation.org> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2232 Lines: 63 On Thu, 15 Jan 2009 16:10:22 -0800 Andrew Morton wrote: > On Wed, 14 Jan 2009 13:16:27 -0800 > David Brownell wrote: > > > From: David Brownell > > > > Minor cleanup to the regulator set_mode sysfs support: > > switch to sysfs_streq() in set_mode(), which is also > > a code shrink. Use the same strings that get_mode() > > uses, shrinking data too. > > > > Signed-off-by: David Brownell > > --- > > drivers/regulator/virtual.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > --- a/drivers/regulator/virtual.c > > +++ b/drivers/regulator/virtual.c > > @@ -226,13 +226,13 @@ static ssize_t set_mode(struct device *d > > unsigned int mode; > > int ret; > > > > - if (strncmp(buf, "fast", strlen("fast")) == 0) > > + if (sysfs_streq(buf, "fast\n") == 0) > > mode = REGULATOR_MODE_FAST; > > - else if (strncmp(buf, "normal", strlen("normal")) == 0) > > + else if (sysfs_streq(buf, "normal\n") == 0) > > mode = REGULATOR_MODE_NORMAL; > > - else if (strncmp(buf, "idle", strlen("idle")) == 0) > > + else if (sysfs_streq(buf, "idle\n") == 0) > > mode = REGULATOR_MODE_IDLE; > > - else if (strncmp(buf, "standby", strlen("standby")) == 0) > > + else if (sysfs_streq(buf, "standby\n") == 0) > > mode = REGULATOR_MODE_STANDBY; > > we don't need the \n's, do we? oh, it's for the string sharing. Sneaky. I wonder how many people will try to fix that up for us? --- a/drivers/regulator/virtual.c~regulator-minor-cleanup-of-virtual-consumer-fix +++ a/drivers/regulator/virtual.c @@ -226,6 +226,10 @@ static ssize_t set_mode(struct device *d unsigned int mode; int ret; + /* + * sysfs_streq() doesn't need the \n's, but we add them so the strings + * will be shared with show_mode(), above. + */ if (sysfs_streq(buf, "fast\n") == 0) mode = REGULATOR_MODE_FAST; else if (sysfs_streq(buf, "normal\n") == 0) _ -- 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/