On 18/02/13 05:14, J Keerthy wrote: > Removing duplicate assignment in the existing code. > > Signed-off-by: J Keerthy <[email protected]> > --- > drivers/regulator/palmas-regulator.c | 5 ----- > 1 files changed, 0 insertions(+), 5 deletions(-) > > diff --git a/drivers/regulator/palmas-regulator.c > b/drivers/regulator/palmas-regulator.c > index c9e912f..22c6ae2 100644 > --- a/drivers/regulator/palmas-regulator.c > +++ b/drivers/regulator/palmas-regulator.c > @@ -566,11 +566,6 @@ static void palmas_dt_to_pdata(struct device *dev, > pdata->reg_init[idx]->mode_sleep = prop; > > ret = of_property_read_u32(palmas_matches[idx].of_node, > - "ti,warm_reset", &prop); > - if (!ret) > - pdata->reg_init[idx]->warm_reset = prop; > - > - ret = of_property_read_u32(palmas_matches[idx].of_node, > "ti,tstep", &prop); > if (!ret) > pdata->reg_init[idx]->tstep = prop; This hunk has already been upstreamed by Axel Lin.
http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commit;h=f33d0081ff3ffb7180a9794e60318458d7671b36 Graeme -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
