From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH v2 1/2] backlight/lp855x: Refactor dt parsing code Date: Wed, 3 Dec 2014 10:15:31 +0000 Message-ID: <20141203101531.GB327@x1> References: <1417570752-23633-1-git-send-email-seanpaul@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1417570752-23633-1-git-send-email-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Sean Paul Cc: milo.kim-l0cyMroinI0@public.gmane.org, cooloney-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, jg1.han-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, =?iso-8859-1?Q?St=E9phane?= Marchesin List-Id: devicetree@vger.kernel.org On Tue, 02 Dec 2014, Sean Paul wrote: > This patch refactors the dt parsing code to avoid setting platform_da= ta, > instead just setting lp->pdata directly. This facilitates easier > probe deferral since the current scheme would require us to clear out > dev->platform_data before deferring. >=20 > Cc: St=C3=A9phane Marchesin > Signed-off-by: Sean Paul > --- > drivers/video/backlight/lp855x_bl.c | 37 ++++++++++++++++++---------= ---------- > 1 file changed, 18 insertions(+), 19 deletions(-) Applied with Acks, thanks. > diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/back= light/lp855x_bl.c > index 25fb8e3..257b3ba 100644 > --- a/drivers/video/backlight/lp855x_bl.c > +++ b/drivers/video/backlight/lp855x_bl.c > @@ -341,8 +341,10 @@ static const struct attribute_group lp855x_attr_= group =3D { > }; > =20 > #ifdef CONFIG_OF > -static int lp855x_parse_dt(struct device *dev, struct device_node *n= ode) > +static int lp855x_parse_dt(struct lp855x *lp) > { > + struct device *dev =3D lp->dev; > + struct device_node *node =3D dev->of_node; > struct lp855x_platform_data *pdata; > int rom_length; > =20 > @@ -381,12 +383,12 @@ static int lp855x_parse_dt(struct device *dev, = struct device_node *node) > pdata->rom_data =3D &rom[0]; > } > =20 > - dev->platform_data =3D pdata; > + lp->pdata =3D pdata; > =20 > return 0; > } > #else > -static int lp855x_parse_dt(struct device *dev, struct device_node *n= ode) > +static int lp855x_parse_dt(struct lp855x *lp) > { > return -EINVAL; > } > @@ -395,18 +397,8 @@ static int lp855x_parse_dt(struct device *dev, s= truct device_node *node) > static int lp855x_probe(struct i2c_client *cl, const struct i2c_devi= ce_id *id) > { > struct lp855x *lp; > - struct lp855x_platform_data *pdata =3D dev_get_platdata(&cl->dev); > - struct device_node *node =3D cl->dev.of_node; > int ret; > =20 > - if (!pdata) { > - ret =3D lp855x_parse_dt(&cl->dev, node); > - if (ret < 0) > - return ret; > - > - pdata =3D dev_get_platdata(&cl->dev); > - } > - > if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK)= ) > return -EIO; > =20 > @@ -414,16 +406,23 @@ static int lp855x_probe(struct i2c_client *cl, = const struct i2c_device_id *id) > if (!lp) > return -ENOMEM; > =20 > - if (pdata->period_ns > 0) > - lp->mode =3D PWM_BASED; > - else > - lp->mode =3D REGISTER_BASED; > - > lp->client =3D cl; > lp->dev =3D &cl->dev; > - lp->pdata =3D pdata; > lp->chipname =3D id->name; > lp->chip_id =3D id->driver_data; > + lp->pdata =3D dev_get_platdata(&cl->dev); > + > + if (!lp->pdata) { > + ret =3D lp855x_parse_dt(lp); > + if (ret < 0) > + return ret; > + } > + > + if (lp->pdata->period_ns > 0) > + lp->mode =3D PWM_BASED; > + else > + lp->mode =3D REGISTER_BASED; > + > i2c_set_clientdata(cl, lp); > =20 > ret =3D lp855x_configure(lp); --=20 Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org =E2=94=82 Open source software for ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html