Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933045AbbGJPCV (ORCPT ); Fri, 10 Jul 2015 11:02:21 -0400 Received: from mail-vn0-f51.google.com ([209.85.216.51]:38466 "EHLO mail-vn0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932278AbbGJPB4 (ORCPT ); Fri, 10 Jul 2015 11:01:56 -0400 MIME-Version: 1.0 In-Reply-To: <1436516798-4132-1-git-send-email-milo.kim@ti.com> References: <1436516798-4132-1-git-send-email-milo.kim@ti.com> From: Sean Paul Date: Fri, 10 Jul 2015 11:01:32 -0400 Message-ID: Subject: Re: [PATCH v2] backlight: lp855x: use private data for regulator control To: Milo Kim Cc: jingoohan1@gmail.com, Lee Jones , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4326 Lines: 117 On Fri, Jul 10, 2015 at 4:26 AM, Milo Kim wrote: > LP855x backlight device can be enabled by external VDD input. > The 'supply' data is used for this purpose. > It's kind of private data which runs internally, so there is no reason to > expose to the platform data. > > And devm_regulator_get() is moved from _parse_dt() to _probe(). > Regulator consumer(lp855x) can control regulator not only from DT but also > from platform data configuration in a source file such like board-*.c. > > If 'power' regulator driver is not ready, lp855x should continue to work > because the power supply control is optional. So -EPROBE_DEFER return code > is removed. > > v1->v2: > Keeps optional property '-supply' in LP855x DT binding. > > Cc: Sean Paul > Cc: Jingoo Han > Cc: Lee Jones > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Milo Kim > --- > drivers/video/backlight/lp855x_bl.c | 20 +++++++++----------- > include/linux/platform_data/lp855x.h | 2 -- > 2 files changed, 9 insertions(+), 13 deletions(-) > > diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c > index a26d3bb..277d5ca 100644 > --- a/drivers/video/backlight/lp855x_bl.c > +++ b/drivers/video/backlight/lp855x_bl.c > @@ -73,6 +73,7 @@ struct lp855x { > struct device *dev; > struct lp855x_platform_data *pdata; > struct pwm_device *pwm; > + struct regulator *supply; /* regulator for VDD input */ > }; > > static int lp855x_write_byte(struct lp855x *lp, u8 reg, u8 data) > @@ -384,13 +385,6 @@ static int lp855x_parse_dt(struct lp855x *lp) > pdata->rom_data = &rom[0]; > } > > - pdata->supply = devm_regulator_get(dev, "power"); > - if (IS_ERR(pdata->supply)) { > - if (PTR_ERR(pdata->supply) == -EPROBE_DEFER) > - return -EPROBE_DEFER; > - pdata->supply = NULL; > - } > - > lp->pdata = pdata; > > return 0; > @@ -431,8 +425,12 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) > else > lp->mode = REGISTER_BASED; > > - if (lp->pdata->supply) { > - ret = regulator_enable(lp->pdata->supply); > + lp->supply = devm_regulator_get(lp->dev, "power"); > + if (IS_ERR(lp->supply)) > + lp->supply = NULL; Hi Milo, You removed the probe deferral handling on the regulator and broke probe deferral in cases where the regulator isn't ready. Please re-introduce the error handling you removed from parse_dt. Sean > + > + if (lp->supply) { > + ret = regulator_enable(lp->supply); > if (ret < 0) { > dev_err(&cl->dev, "failed to enable supply: %d\n", ret); > return ret; > @@ -470,8 +468,8 @@ static int lp855x_remove(struct i2c_client *cl) > > lp->bl->props.brightness = 0; > backlight_update_status(lp->bl); > - if (lp->pdata->supply) > - regulator_disable(lp->pdata->supply); > + if (lp->supply) > + regulator_disable(lp->supply); > sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group); > > return 0; > diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h > index 9c7fd1e..1b2ba24 100644 > --- a/include/linux/platform_data/lp855x.h > +++ b/include/linux/platform_data/lp855x.h > @@ -136,7 +136,6 @@ struct lp855x_rom_data { > Only valid when mode is PWM_BASED. > * @size_program : total size of lp855x_rom_data > * @rom_data : list of new eeprom/eprom registers > - * @supply : regulator that supplies 3V input > */ > struct lp855x_platform_data { > const char *name; > @@ -145,7 +144,6 @@ struct lp855x_platform_data { > unsigned int period_ns; > int size_program; > struct lp855x_rom_data *rom_data; > - struct regulator *supply; > }; > > #endif > -- > 1.9.1 > -- 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/