From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752935AbaDOKZg (ORCPT ); Tue, 15 Apr 2014 06:25:36 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:55089 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751200AbaDOKZe (ORCPT ); Tue, 15 Apr 2014 06:25:34 -0400 Date: Tue, 15 Apr 2014 11:25:27 +0100 From: Lee Jones To: Charles Keepax Cc: broonie@kernel.org, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, rob@landley.net, sameo@linux.intel.com, lgirdwood@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/6] mfd: arizona: Factor out read of device tree GPIOs Message-ID: <20140415102527.GD27091@lee--X1> References: <1396340845-24060-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1396340845-24060-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1396340845-24060-2-git-send-email-ckeepax@opensource.wolfsonmicro.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 On Tue, 01 Apr 2014, Charles Keepax wrote: > This patch factors out the reading of GPIOs for the Arizona devices > into a helper function. > > Signed-off-by: Charles Keepax > --- > drivers/mfd/arizona-core.c | 33 ++++++++++++++++++++++++--------- > include/linux/mfd/arizona/core.h | 3 +++ > 2 files changed, 27 insertions(+), 9 deletions(-) > > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index a45aab9..8ad4373 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -512,19 +512,34 @@ int arizona_of_get_type(struct device *dev) > } > EXPORT_SYMBOL_GPL(arizona_of_get_type); > > +int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop, > + bool mandatory, int *gpio) > +{ > + int ret; > + > + ret = of_get_named_gpio(arizona->dev->of_node, prop, 0); > + *gpio = ret; > + if (ret >= 0) > + return ret; > + > + *gpio = 0; > + > + if (mandatory) > + dev_err(arizona->dev, > + "Mandatory DT gpio %s missing/malformed: %d\n", > + prop, ret); > + > + return ret; > +} Hmm.. me no likey! How about: +void arizona_of_get_named_gpio(struct arizona *arizona, const char *prop, + bool mandatory, int *gpio) +{ + *gpio = of_get_named_gpio(arizona->dev->of_node, prop, 0); + if (*gpio < 0) { + if (mandatory) + dev_err(arizona->dev, + "Mandatory DT gpio %s missing/malformed: %d\n", + prop, *gpio); + *gpio = 0; + } +} > +EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio); > + Are you sure you're going to use this externally? NB: I haven't looked at the remainder of the set yet. > static int arizona_of_get_core_pdata(struct arizona *arizona) > { > + struct arizona_pdata *pdata = &arizona->pdata; > int ret, i; > > - arizona->pdata.reset = of_get_named_gpio(arizona->dev->of_node, > - "wlf,reset", 0); > - if (arizona->pdata.reset < 0) > - arizona->pdata.reset = 0; > - > - arizona->pdata.ldoena = of_get_named_gpio(arizona->dev->of_node, > - "wlf,ldoena", 0); > - if (arizona->pdata.ldoena < 0) > - arizona->pdata.ldoena = 0; > + arizona_of_get_named_gpio(arizona, "wlf,reset", true, &pdata->reset); > + arizona_of_get_named_gpio(arizona, "wlf,ldoena", true, &pdata->ldoena); I guess this pdata is populated by DT? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog