The patch titled powerpc: devres: add devm_ioremap_prot() has been added to the -mm tree. Its filename is powerpc-devres-add-devm_ioremap_prot.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: powerpc: devres: add devm_ioremap_prot() From: Emil Medve <Emilian.Medve@xxxxxxxxxxxxx> We provide an ioremap_flags so provide a corresponding devm_ioremap_prot. The slight name difference is at Ben Herrenschmidt request as he plans on changing ioremap_flags to ioremap_prot in the future. Signed-off-by: Emil Medve <Emilian.Medve@xxxxxxxxxxxxx> Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Tejun Heo <htejun@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/lib/Makefile | 1 + arch/powerpc/lib/devres.c | 33 +++++++++++++++++++++++++++++++++ include/asm-powerpc/io.h | 8 +++++++- include/linux/io.h | 1 + lib/devres.c | 2 +- 5 files changed, 43 insertions(+), 2 deletions(-) diff -puN arch/powerpc/lib/Makefile~powerpc-devres-add-devm_ioremap_prot arch/powerpc/lib/Makefile --- a/arch/powerpc/lib/Makefile~powerpc-devres-add-devm_ioremap_prot +++ a/arch/powerpc/lib/Makefile @@ -23,3 +23,4 @@ obj-$(CONFIG_SMP) += locks.o endif obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o +obj-$(CONFIG_HAS_IOMEM) += devres.o diff -puN /dev/null arch/powerpc/lib/devres.c --- /dev/null +++ a/arch/powerpc/lib/devres.c @@ -0,0 +1,33 @@ +#include <linux/device.h> /* devres_*(), devm_ioremap_release() */ +#include <linux/io.h> /* ioremap_flags() */ +#include <linux/module.h> /* EXPORT_SYMBOL() */ + +/** + * devm_ioremap_prot - Managed ioremap_flags() + * @dev: Generic device to remap IO address for + * @offset: BUS offset to map + * @size: Size of map + * @flags: Page flags + * + * Managed ioremap_prot(). Map is automatically unmapped on driver + * detach. + */ +void __iomem *devm_ioremap_prot(struct device *dev, resource_size_t offset, + size_t size, unsigned long flags) +{ + void __iomem **ptr, *addr; + + ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return NULL; + + addr = ioremap_flags(offset, size, flags); + if (addr) { + *ptr = addr; + devres_add(dev, ptr); + } else + devres_free(ptr); + + return addr; +} +EXPORT_SYMBOL(devm_ioremap_prot); diff -puN include/asm-powerpc/io.h~powerpc-devres-add-devm_ioremap_prot include/asm-powerpc/io.h --- a/include/asm-powerpc/io.h~powerpc-devres-add-devm_ioremap_prot +++ a/include/asm-powerpc/io.h @@ -2,7 +2,7 @@ #define _ASM_POWERPC_IO_H #ifdef __KERNEL__ -/* +/* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version @@ -18,6 +18,9 @@ extern int check_legacy_ioport(unsigned #define _PNPWRP 0xa79 #define PNPBIOS_BASE 0xf000 +#include <linux/device.h> +#include <linux/io.h> + #include <linux/compiler.h> #include <asm/page.h> #include <asm/byteorder.h> @@ -744,6 +747,9 @@ static inline void * bus_to_virt(unsigne #define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set) +void __iomem *devm_ioremap_prot(struct device *dev, resource_size_t offset, + size_t size, unsigned long flags); + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_IO_H */ diff -puN include/linux/io.h~powerpc-devres-add-devm_ioremap_prot include/linux/io.h --- a/include/linux/io.h~powerpc-devres-add-devm_ioremap_prot +++ a/include/linux/io.h @@ -65,5 +65,6 @@ void __iomem * devm_ioremap_nocache(stru void devm_iounmap(struct device *dev, void __iomem *addr); int check_signature(const volatile void __iomem *io_addr, const unsigned char *signature, int length); +void devm_ioremap_release(struct device *dev, void *res); #endif /* _LINUX_IO_H */ diff -puN lib/devres.c~powerpc-devres-add-devm_ioremap_prot lib/devres.c --- a/lib/devres.c~powerpc-devres-add-devm_ioremap_prot +++ a/lib/devres.c @@ -2,7 +2,7 @@ #include <linux/io.h> #include <linux/module.h> -static void devm_ioremap_release(struct device *dev, void *res) +void devm_ioremap_release(struct device *dev, void *res) { iounmap(*(void __iomem **)res); } _ Patches currently in -mm which might be from Emilian.Medve@xxxxxxxxxxxxx are powerpc-devres-add-devm_ioremap_prot.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html