| Message ID | 20230719-thermal-sun8i-free-nvmem-v1-1-f553d5afef79@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Daniel Lezcano |
| Headers | show |
| Series | thermal/drivers/sun8i: Free calibration nvmem after reading it | expand |
Dne sreda, 19. julij 2023 ob 02:58:54 CEST je Mark Brown napisal(a): > The sun8i thermal driver reads calibration data via the nvmem API at > startup, updating the device configuration and not referencing the data > again. Rather than explicitly freeing the nvmem data the driver relies > on devm_ to release it, even though the data is never referenced again. > The allocation is still tracked so it's not leaked but this is notable > when looking at the code and is a little wasteful so let's instead > explicitly free the nvmem after we're done with it. > > Signed-off-by: Mark Brown <broonie@kernel.org> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > --- > drivers/thermal/sun8i_thermal.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/sun8i_thermal.c > b/drivers/thermal/sun8i_thermal.c index 195f3c5d0b38..af3098717e3c 100644 > --- a/drivers/thermal/sun8i_thermal.c > +++ b/drivers/thermal/sun8i_thermal.c > @@ -286,7 +286,7 @@ static int sun8i_ths_calibrate(struct ths_device *tmdev) > size_t callen; > int ret = 0; > > - calcell = devm_nvmem_cell_get(dev, "calibration"); > + calcell = nvmem_cell_get(dev, "calibration"); > if (IS_ERR(calcell)) { > if (PTR_ERR(calcell) == -EPROBE_DEFER) > return -EPROBE_DEFER; > @@ -316,6 +316,8 @@ static int sun8i_ths_calibrate(struct ths_device *tmdev) > > kfree(caldata); > out: > + if (!IS_ERR(calcell)) > + nvmem_cell_put(calcell); > return ret; > } > > > --- > base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c > change-id: 20230718-thermal-sun8i-free-nvmem-3e9e21306e3e > > Best regards,
On 19/07/2023 02:58, Mark Brown wrote: > The sun8i thermal driver reads calibration data via the nvmem API at > startup, updating the device configuration and not referencing the data > again. Rather than explicitly freeing the nvmem data the driver relies > on devm_ to release it, even though the data is never referenced again. > The allocation is still tracked so it's not leaked but this is notable > when looking at the code and is a little wasteful so let's instead > explicitly free the nvmem after we're done with it. > > Signed-off-by: Mark Brown <broonie@kernel.org> Applied, thanks
diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c index 195f3c5d0b38..af3098717e3c 100644 --- a/drivers/thermal/sun8i_thermal.c +++ b/drivers/thermal/sun8i_thermal.c @@ -286,7 +286,7 @@ static int sun8i_ths_calibrate(struct ths_device *tmdev) size_t callen; int ret = 0; - calcell = devm_nvmem_cell_get(dev, "calibration"); + calcell = nvmem_cell_get(dev, "calibration"); if (IS_ERR(calcell)) { if (PTR_ERR(calcell) == -EPROBE_DEFER) return -EPROBE_DEFER; @@ -316,6 +316,8 @@ static int sun8i_ths_calibrate(struct ths_device *tmdev) kfree(caldata); out: + if (!IS_ERR(calcell)) + nvmem_cell_put(calcell); return ret; }
The sun8i thermal driver reads calibration data via the nvmem API at startup, updating the device configuration and not referencing the data again. Rather than explicitly freeing the nvmem data the driver relies on devm_ to release it, even though the data is never referenced again. The allocation is still tracked so it's not leaked but this is notable when looking at the code and is a little wasteful so let's instead explicitly free the nvmem after we're done with it. Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/thermal/sun8i_thermal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c change-id: 20230718-thermal-sun8i-free-nvmem-3e9e21306e3e Best regards,