Skip to contentSkip to conversation

ppc: remove unused devm_ioremap_prot

PATCH In review Kyle McMartin 3 participants 3 messages May 25, 2013 – May 26, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc: remove unused devm_ioremap_prot

Added in 2008, but has never had any in-tree users, and no other architectures provide it. Also remove the header includes that the commit b41e5fff added to asm/io.h, and add an include of mutex.h for asm/eeh.h, which relied on io.h including device.h to provide it.

Tested ppc64_defconfig in an xcompiler, and it passed... no promises I didn't introduce a header mess on some random variant though.

arch/powerpc/include/asm/eeh.h +1 -0
@@ -23,6 +23,7 @@
 
 #include <linux/init.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 #include <linux/string.h>
 
 struct pci_dev;
arch/powerpc/include/asm/io.h +0 -6
index dd15e5e..ab503b6 100644
@@ -24,9 +24,6 @@ extern struct pci_dev *isa_bridge_pcidev;
 #define arch_has_dev_port()	(isa_bridge_pcidev != NULL)
 #endif
 
-#include <linux/device.h>
-#include <linux/io.h>
-
 #include <linux/compiler.h>
 #include <asm/page.h>
 #include <asm/byteorder.h>
@@ -791,9 +788,6 @@ 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 */
arch/powerpc/lib/Makefile +0 -1
index 4504332..bda49b4 100644
@@ -12,7 +12,6 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
 obj-y			:= string.o alloc.o \
 			   checksum_$(CONFIG_WORD_SIZE).o crtsavres.o
 obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
-obj-$(CONFIG_HAS_IOMEM)	+= devres.o
 
 obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
 			   memcpy_64.o usercopy_64.o mem_64.o string.o \
arch/powerpc/lib/devres.c deleted +0 -43

43 lines not on this page · raw message

#1 lore raw
Quoted 10 lines · Kyle McMartin

Added in 2008, but has never had any in-tree users, and no other architectures provide it. Also remove the header includes that the commit b41e5fff added to asm/io.h, and add an include of mutex.h for asm/eeh.h, which relied on io.h including device.h to provide it.

Tested ppc64_defconfig in an xcompiler, and it passed... no promises I didn't introduce a header mess on some random variant though.

It's not used ... yet. It's needed if we ever are to implement something like devm_ioremap_wc(). I suspect if things like framebuffer or even IB drivers start using devm this will be needed.

Any specific reason why you want to take it out ?

Cheers,
Ben.

Quoted 94 lines

+++ b/arch/powerpc/include/asm/eeh.h

arch/powerpc/include/asm/eeh.h +1 -0
@@ -23,6 +23,7 @@
 
 #include <linux/init.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 #include <linux/string.h>
 
 struct pci_dev;
arch/powerpc/include/asm/io.h +0 -6
index dd15e5e..ab503b6 100644
@@ -24,9 +24,6 @@ extern struct pci_dev *isa_bridge_pcidev;
 #define arch_has_dev_port()	(isa_bridge_pcidev != NULL)
 #endif
 
-#include <linux/device.h>
-#include <linux/io.h>
-
 #include <linux/compiler.h>
 #include <asm/page.h>
 #include <asm/byteorder.h>
@@ -791,9 +788,6 @@ 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 */
arch/powerpc/lib/Makefile +0 -1
index 4504332..bda49b4 100644
@@ -12,7 +12,6 @@ CFLAGS_REMOVE_feature-fixups.o = -pg
 obj-y			:= string.o alloc.o \
 			   checksum_$(CONFIG_WORD_SIZE).o crtsavres.o
 obj-$(CONFIG_PPC32)	+= div64.o copy_32.o
-obj-$(CONFIG_HAS_IOMEM)	+= devres.o
 
 obj-$(CONFIG_PPC64)	+= copypage_64.o copyuser_64.o \
 			   memcpy_64.o usercopy_64.o mem_64.o string.o \
arch/powerpc/lib/devres.c deleted +0 -43
deleted file mode 100644
index 8df55fc..0000000
@@ -1,43 +0,0 @@
-/*
- * 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/gfp.h>
-#include <linux/io.h>		/* ioremap_prot() */
-#include <linux/export.h>	/* EXPORT_SYMBOL() */
-
-/**
- * devm_ioremap_prot - Managed ioremap_prot()
- * @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_prot(offset, size, flags);
-	if (addr) {
-		*ptr = addr;
-		devres_add(dev, ptr);
-	} else
-		devres_free(ptr);
-
-	return addr;
-}
-EXPORT_SYMBOL(devm_ioremap_prot);
#2 lore raw
Quoted 6 lines · Benjamin Herrenschmidt

It's not used ... yet. It's needed if we ever are to implement something like devm_ioremap_wc(). I suspect if things like framebuffer or even IB drivers start using devm this will be needed.

Any specific reason why you want to take it out ?

No particular reason...

ioremap on ppc64 came up in conversation with Adam Jackson, and I noticed ppc64 had an interface nobody else had, figured it might have been added, then forgotten.

regards, Kyle