| Message ID | 20230318143851.2191625-1-jingfelix@hust.edu.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] drivers: hwmon: fix ioremap and memremap leak | expand |
On Sat, Mar 18, 2023 at 10:38:51PM +0800, Tianyi Jing wrote: > Smatch reports: > > drivers/hwmon/xgene-hwmon.c:757 xgene_hwmon_probe() warn: > 'ctx->pcc_comm_addr' from ioremap() not released on line: 757. > > This is because in drivers/hwmon/xgene-hwmon.c:701 xgene_hwmon_probe(), > ioremap and memremap is not released, which may cause a leak. > > To fix this, ioremap and memremap is modified to devm_ioremap and > devm_memremap. > > Signed-off-by: Tianyi Jing <jingfelix@hust.edu.cn> > Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn> Applied. Note that I updated the subject and changed formatting a bit. Guenter > --- > v1 -> v2: use devm_ioremap and devm_memremap instead. > drivers/hwmon/xgene-hwmon.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c > index 5cde837bfd09..a25fae9b19b7 100644 > --- a/drivers/hwmon/xgene-hwmon.c > +++ b/drivers/hwmon/xgene-hwmon.c > @@ -698,11 +698,13 @@ static int xgene_hwmon_probe(struct platform_device *pdev) > ctx->comm_base_addr = pcc_chan->shmem_base_addr; > if (ctx->comm_base_addr) { > if (version == XGENE_HWMON_V2) > - ctx->pcc_comm_addr = (void __force *)ioremap( > + ctx->pcc_comm_addr = (void __force *)devm_ioremap( > + &pdev->dev, > ctx->comm_base_addr, > pcc_chan->shmem_size); > else > - ctx->pcc_comm_addr = memremap( > + ctx->pcc_comm_addr = devm_memremap( > + &pdev->dev, > ctx->comm_base_addr, > pcc_chan->shmem_size, > MEMREMAP_WB);
diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c index 5cde837bfd09..a25fae9b19b7 100644 --- a/drivers/hwmon/xgene-hwmon.c +++ b/drivers/hwmon/xgene-hwmon.c @@ -698,11 +698,13 @@ static int xgene_hwmon_probe(struct platform_device *pdev) ctx->comm_base_addr = pcc_chan->shmem_base_addr; if (ctx->comm_base_addr) { if (version == XGENE_HWMON_V2) - ctx->pcc_comm_addr = (void __force *)ioremap( + ctx->pcc_comm_addr = (void __force *)devm_ioremap( + &pdev->dev, ctx->comm_base_addr, pcc_chan->shmem_size); else - ctx->pcc_comm_addr = memremap( + ctx->pcc_comm_addr = devm_memremap( + &pdev->dev, ctx->comm_base_addr, pcc_chan->shmem_size, MEMREMAP_WB);