Message ID | v7l2skqj65vbku3ebjsfndfj3atl6iqpodamios2do6q6kcagf@whmuir6fwede (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | None | expand |
On Tue, 4 Mar 2025 10:41:09 +0100 Uwe Kleine-König <u.kleine-koenig@baylibre.com> wrote: > Since commit a6eaf02b8274 ("iio: adc: ad7124: Switch from of specific to > fwnode based property handling") the function > ad7124_parse_channel_config() has a parameter `dev` that holds > the value `indio_dev->dev.parent`. Make use of that to shorten two code > lines. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> > --- > Hello, > > this is a patch opportunity I noticed while backporting my original > series to an older kernel to please my customer. > I chose to sneak it into the series in the hope to not offend maintainer > tools :-) Leads to b4 getting rather confused, but doing the right thing in the end. Applied. Thanks, Jonathan > > Best regards > Uwe > > drivers/iio/adc/ad7124.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c > index 5ab0d3e48c43..53b274ca42ac 100644 > --- a/drivers/iio/adc/ad7124.c > +++ b/drivers/iio/adc/ad7124.c > @@ -1061,12 +1061,12 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev, > /* Add one for temperature */ > st->num_channels = min(num_channels + 1, AD7124_MAX_CHANNELS); > > - chan = devm_kcalloc(indio_dev->dev.parent, st->num_channels, > + chan = devm_kcalloc(dev, st->num_channels, > sizeof(*chan), GFP_KERNEL); > if (!chan) > return -ENOMEM; > > - channels = devm_kcalloc(indio_dev->dev.parent, st->num_channels, sizeof(*channels), > + channels = devm_kcalloc(dev, st->num_channels, sizeof(*channels), > GFP_KERNEL); > if (!channels) > return -ENOMEM;
On Thu, Mar 06, 2025 at 12:10:13AM +0000, Jonathan Cameron wrote: > On Tue, 4 Mar 2025 10:41:09 +0100 > Uwe Kleine-König <u.kleine-koenig@baylibre.com> wrote: > > this is a patch opportunity I noticed while backporting my original > > series to an older kernel to please my customer. > > I chose to sneak it into the series in the hope to not offend maintainer > > tools :-) > Leads to b4 getting rather confused, but doing the right thing in the end. Oh, I failed to pass `--in-reply-to 20250303114659.1672695-10-u.kleine-koenig@baylibre.com` to really do what I intended.
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c index 5ab0d3e48c43..53b274ca42ac 100644 --- a/drivers/iio/adc/ad7124.c +++ b/drivers/iio/adc/ad7124.c @@ -1061,12 +1061,12 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev, /* Add one for temperature */ st->num_channels = min(num_channels + 1, AD7124_MAX_CHANNELS); - chan = devm_kcalloc(indio_dev->dev.parent, st->num_channels, + chan = devm_kcalloc(dev, st->num_channels, sizeof(*chan), GFP_KERNEL); if (!chan) return -ENOMEM; - channels = devm_kcalloc(indio_dev->dev.parent, st->num_channels, sizeof(*channels), + channels = devm_kcalloc(dev, st->num_channels, sizeof(*channels), GFP_KERNEL); if (!channels) return -ENOMEM;
Since commit a6eaf02b8274 ("iio: adc: ad7124: Switch from of specific to fwnode based property handling") the function ad7124_parse_channel_config() has a parameter `dev` that holds the value `indio_dev->dev.parent`. Make use of that to shorten two code lines. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> --- Hello, this is a patch opportunity I noticed while backporting my original series to an older kernel to please my customer. I chose to sneak it into the series in the hope to not offend maintainer tools :-) Best regards Uwe drivers/iio/adc/ad7124.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)