On Tue, Aug 16, 2016 at 10:34:58AM +0100, Lee Jones wrote: > This is to bring the terminology used in the STi PWM driver more > into line with the PWM subsystem. > > Signed-off-by: Lee Jones > --- > drivers/pwm/pwm-sti.c | 32 ++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) Note that it's fine if drivers use different terminology for internals. Many manuals seem to be using the channel terminology and many drivers use that. But if you prefer devices that's fine with me. I've applied this with a minor change, see below. > diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c [...] > - of_property_read_u32(np, "st,pwm-num-chan", &num_chan); > - if (num_chan) > - cdata->num_chan = num_chan; > + of_property_read_u32(np, "st,pwm-num-chans", &num_devs); > + if (num_devs) > + cdata->num_devs = num_devs; I kept the "st,pwm-num-chan" as property name here to avoid breaking backwards compatiblity. This series changes it back to "st,pwm-num-chan" sometime later in this series anyway. Thierry