Add auto-release cleanups for iounmap() and ioport_unmap().
Signed-off-by: David E. Box <david.e.box@xxxxxxxxxxxxxxx>
Suggested-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
---
V2 - Move from linux/io.h to asm-generic/io.h. Adds iounmap cleanup if
iounmap() is defined. Adds ioport_unmap cleanup if CONFIG_IOPORT_MAP
is defined.
include/asm-generic/io.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index bac63e874c7b..9ef0332490b1 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -8,6 +8,7 @@
#define __ASM_GENERIC_IO_H
#include <asm/page.h> /* I/O is all done through memory accesses */
+#include <linux/cleanup.h>
#include <linux/string.h> /* for memset() and memcpy() */
#include <linux/types.h>
#include <linux/instruction_pointer.h>
@@ -1065,6 +1066,10 @@ static inline void __iomem *ioremap(phys_addr_t addr, size_t size)
#endif
#endif /* !CONFIG_MMU || CONFIG_GENERIC_IOREMAP */
+#ifdef iounmap
+DEFINE_FREE(iounmap, void __iomem *, iounmap(_T));
+#endif
+
#ifndef ioremap_wc
#define ioremap_wc ioremap
#endif
@@ -1127,6 +1132,7 @@ static inline void ioport_unmap(void __iomem *p)
extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
extern void ioport_unmap(void __iomem *p);
#endif /* CONFIG_GENERIC_IOMAP */
+DEFINE_FREE(ioport_unmap, void __iomem *, ioport_unmap(_T));
#endif /* CONFIG_HAS_IOPORT_MAP */
#ifndef CONFIG_GENERIC_IOMAP
--
2.34.1
