On Wed, 15 Jul 2020 11:25:28 +0200 Bartosz Golaszewski <brgl@xxxxxxxx> wrote: > From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> > > Use the managed variant of krealloc() and shrink the code a bit. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> Looks good to me. Acked-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > --- > drivers/iio/adc/xilinx-xadc-core.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c > index d7fecab9252e4..5bdbe502e983a 100644 > --- a/drivers/iio/adc/xilinx-xadc-core.c > +++ b/drivers/iio/adc/xilinx-xadc-core.c > @@ -1094,6 +1094,7 @@ MODULE_DEVICE_TABLE(of, xadc_of_match_table); > static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > unsigned int *conf) > { > + struct device *dev = indio_dev->dev.parent; > struct xadc *xadc = iio_priv(indio_dev); > struct iio_chan_spec *channels, *chan; > struct device_node *chan_node, *child; > @@ -1138,7 +1139,8 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > *conf |= XADC_CONF0_MUX | XADC_CONF0_CHAN(ext_mux_chan); > } > > - channels = kmemdup(xadc_channels, sizeof(xadc_channels), GFP_KERNEL); > + channels = devm_kmemdup(dev, xadc_channels, > + sizeof(xadc_channels), GFP_KERNEL); > if (!channels) > return -ENOMEM; > > @@ -1174,8 +1176,9 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > of_node_put(chan_node); > > indio_dev->num_channels = num_channels; > - indio_dev->channels = krealloc(channels, sizeof(*channels) * > - num_channels, GFP_KERNEL); > + indio_dev->channels = devm_krealloc(dev, channels, > + sizeof(*channels) * num_channels, > + GFP_KERNEL); > /* If we can't resize the channels array, just use the original */ > if (!indio_dev->channels) > indio_dev->channels = channels; > @@ -1229,14 +1232,14 @@ static int xadc_probe(struct platform_device *pdev) > > ret = xadc_parse_dt(indio_dev, pdev->dev.of_node, &conf0); > if (ret) > - goto err_device_free; > + return ret; > > if (xadc->ops->flags & XADC_FLAGS_BUFFERED) { > ret = iio_triggered_buffer_setup(indio_dev, > &iio_pollfunc_store_time, &xadc_trigger_handler, > &xadc_buffer_ops); > if (ret) > - goto err_device_free; > + return ret; > > xadc->convst_trigger = xadc_alloc_trigger(indio_dev, "convst"); > if (IS_ERR(xadc->convst_trigger)) { > @@ -1354,8 +1357,6 @@ static int xadc_probe(struct platform_device *pdev) > err_triggered_buffer_cleanup: > if (xadc->ops->flags & XADC_FLAGS_BUFFERED) > iio_triggered_buffer_cleanup(indio_dev); > -err_device_free: > - kfree(indio_dev->channels); > > return ret; > } > @@ -1375,7 +1376,6 @@ static int xadc_remove(struct platform_device *pdev) > cancel_delayed_work_sync(&xadc->zynq_unmask_work); > clk_disable_unprepare(xadc->clk); > kfree(xadc->data); > - kfree(indio_dev->channels); > > return 0; > }