lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

of: remove asm/of_device.h

Browse Source 
It is mostly unused now.  Sparc has a few defines left in it, but they
can be moved to other headers.  Removing this header means that new
architectures adding CONFIG_OF support don't need to also add this
header file.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Grant Likely
2010-06-29 11:15:54 -06:00
parent 129ac799ad
commit 2959604296
6 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/microblaze/include/asm/of_device.h
View File

@@ -1,13 +0,0 @@
/*
* Copyright (C) 2007-2008 Michal Simek <monstr@monstr.eu>
*
* based on PowerPC of_device.h
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
#ifndef _ASM_MICROBLAZE_OF_DEVICE_H
#define _ASM_MICROBLAZE_OF_DEVICE_H
#endif /* _ASM_MICROBLAZE_OF_DEVICE_H */

3
arch/powerpc/include/asm/of_device.h
View File

@@ -1,3 +0,0 @@
#ifndef _ASM_POWERPC_OF_DEVICE_H
#define _ASM_POWERPC_OF_DEVICE_H
#endif /* _ASM_POWERPC_OF_DEVICE_H */

2
arch/sparc/include/asm/device.h
View File

@@ -19,6 +19,8 @@ struct dev_archdata {
int numa_node; int numa_node;
}; };
extern void of_propagate_archdata(struct platform_device *bus);
struct pdev_archdata { struct pdev_archdata {
struct resource resource[PROMREG_MAX]; struct resource resource[PROMREG_MAX];
unsigned int irqs[PROMINTR_MAX]; unsigned int irqs[PROMINTR_MAX];

19
arch/sparc/include/asm/of_device.h
View File

@@ -1,19 +0,0 @@
#ifndef _ASM_SPARC_OF_DEVICE_H
#define _ASM_SPARC_OF_DEVICE_H
#ifdef __KERNEL__
#include <linux/device.h>
#include <linux/of.h>
#include <linux/mod_devicetable.h>
#include <asm/openprom.h>
extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);
extern void of_propagate_archdata(struct of_device *bus);
/* This is just here during the transition */
#include <linux/of_platform.h>
#endif /* __KERNEL__ */
#endif /* _ASM_SPARC_OF_DEVICE_H */

4
arch/sparc/include/asm/prom.h
View File

@@ -51,6 +51,10 @@ extern void prom_build_devicetree(void);
extern void of_populate_present_mask(void); extern void of_populate_present_mask(void);
extern void of_fill_in_cpu_data(void); extern void of_fill_in_cpu_data(void);
struct resource;
extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);
/* These routines are here to provide compatibility with how powerpc /* These routines are here to provide compatibility with how powerpc
* handles IRQ mapping for OF device nodes. We precompute and permanently * handles IRQ mapping for OF device nodes. We precompute and permanently
* register them in the of_device objects, whereas powerpc computes them * register them in the of_device objects, whereas powerpc computes them

2
include/linux/of_device.h
View File

@@ -16,12 +16,12 @@
*/ */
#define of_device platform_device #define of_device platform_device
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_platform.h> /* temporary until merge */
#ifdef CONFIG_OF_DEVICE #ifdef CONFIG_OF_DEVICE
#include <linux/device.h> #include <linux/device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <asm/of_device.h>
#define to_of_device(d) container_of(d, struct of_device, dev) #define to_of_device(d) container_of(d, struct of_device, dev)