Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b41e5fff authored by Emil Medve's avatar Emil Medve Committed by Paul Mackerras
Browse files

[POWERPC] devres: Add devm_ioremap_prot() 



We provide an ioremap_flags, so this provides a corresponding
devm_ioremap_prot.  The slight name difference is at Ben
Herrenschmidt's request as he plans on changing ioremap_flags to
ioremap_prot in the future.

Signed-off-by: default avatarEmil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Acked-by: default avatarTejun Heo <htejun@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent af3ce514

arch/powerpc/lib/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -23,3 +23,4 @@ obj-$(CONFIG_SMP) += locks.o 
endif



obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o

obj-$(CONFIG_HAS_IOMEM)	+= devres.o

arch/powerpc/lib/devres.c

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 Freescale Semiconductor, Inc.

 *

 * 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

 * 2 of the License, or (at your option) any later version.

 */



#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);

include/asm-powerpc/io.h

+7 −1
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ extern int check_legacy_ioport(unsigned long base_port); 
#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(unsigned long address) 


#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 */

include/linux/io.h

+1 −0
Original line number Diff line number Diff line
@@ -65,5 +65,6 @@ void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset, 
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 */

lib/devres.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}