]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
lib: devres: Simplify API devm_iounmap() implementation
authorZijun Hu <quic_zijuhu@quicinc.com>
Wed, 18 Sep 2024 14:48:13 +0000 (22:48 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Oct 2024 06:21:09 +0000 (08:21 +0200)
Simplify devm_iounmap() implementation by dedicated API devres_release()
compared with current solution, namely, devres_destroy() + iounmap()
devres_release() has the following advantages:

- it is simpler if devm_iounmap()'s parameter @addr is valid, namely
  @addr was ever returned by one of devm_ioremap() variants.

- it can avoid unnecessary iounmap(@addr) if @addr is not valid.

Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20240918-fix_lib_devres-v1-1-e696ab5486e6@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
lib/devres.c

index 4fc152de6d8bb1232aeca382a313bd9ff56b8f60..68ffcd5d9358478a428f246d74aaba3cd6c9cc87 100644 (file)
@@ -115,9 +115,8 @@ EXPORT_SYMBOL(devm_ioremap_wc);
  */
 void devm_iounmap(struct device *dev, void __iomem *addr)
 {
-       WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
+       WARN_ON(devres_release(dev, devm_ioremap_release, devm_ioremap_match,
                               (__force void *)addr));
-       iounmap(addr);
 }
 EXPORT_SYMBOL(devm_iounmap);