On Sat, Feb 23, 2013 at 06:55:45PM +0200, Ville Syrjälä wrote: > On Fri, Feb 22, 2013 at 11:58:39PM -0800, Dmitry Torokhov wrote: > > The platform data in the dveice structure does not belong to the driver > > and so it should not be trying to alter it, but instead use a local pointer > > and populate it with a local copy in case we are dealing with device tree > > setup. > > > > Also allow mixed setups where platform data coexists with device tree and > > prefer kernel-supplied data (it may be easier to fiddle in kernel structure > > before committing final result to device tree). > > > > Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com> > > --- > > drivers/w1/masters/w1-gpio.c | 93 > > +++++++++++++++++++++++++------------------- > > 1 file changed, 53 insertions(+), 40 deletions(-) > > > > diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c > > index aa97a96..ee6b6e3 100644 > > --- a/drivers/w1/masters/w1-gpio.c > > +++ b/drivers/w1/masters/w1-gpio.c > > @@ -23,28 +23,33 @@ > > #include "../w1.h" > > #include "../w1_int.h" > > > > +struct w1_gpio { > > + struct w1_bus_master master; > > + const struct w1_gpio_platform_data *pdata; > > +}; > > I don't understand why you need this wrapper struct. It doesn't > seem to serve much purpose, other than to cause code churn in > the patch.
Hm, yes, you are right, I should be able to get rid of it... Thanks. -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/