diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-10-29 14:07:23 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-29 14:07:23 -0400 |
commit | d052d1beff706920e82c5d55006b08e256b5df09 (patch) | |
tree | dac91b70361b405ab8e15207f514a2f3e991e93d /include | |
parent | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (diff) |
Create platform_device.h to contain all the platform device details.
Convert everyone who uses platform_bus_type to include
linux/platform_device.h.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ppc/ppc_sys.h | 2 | ||||
-rw-r--r-- | include/linux/device.h | 26 | ||||
-rw-r--r-- | include/linux/serial_8250.h | 2 |
3 files changed, 2 insertions, 28 deletions
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h index 549f44843c5e..bba5305c29ed 100644 --- a/include/asm-ppc/ppc_sys.h +++ b/include/asm-ppc/ppc_sys.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #define __ASM_PPC_SYS_H | 18 | #define __ASM_PPC_SYS_H |
19 | 19 | ||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
23 | 23 | ||
24 | #if defined(CONFIG_8260) | 24 | #if defined(CONFIG_8260) |
diff --git a/include/linux/device.h b/include/linux/device.h index a9e72ac3fb9f..17cbc6db67b4 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -396,32 +396,6 @@ extern struct device * get_device(struct device * dev); | |||
396 | extern void put_device(struct device * dev); | 396 | extern void put_device(struct device * dev); |
397 | 397 | ||
398 | 398 | ||
399 | /* drivers/base/platform.c */ | ||
400 | |||
401 | struct platform_device { | ||
402 | const char * name; | ||
403 | u32 id; | ||
404 | struct device dev; | ||
405 | u32 num_resources; | ||
406 | struct resource * resource; | ||
407 | }; | ||
408 | |||
409 | #define to_platform_device(x) container_of((x), struct platform_device, dev) | ||
410 | |||
411 | extern int platform_device_register(struct platform_device *); | ||
412 | extern void platform_device_unregister(struct platform_device *); | ||
413 | |||
414 | extern struct bus_type platform_bus_type; | ||
415 | extern struct device platform_bus; | ||
416 | |||
417 | extern struct resource *platform_get_resource(struct platform_device *, unsigned int, unsigned int); | ||
418 | extern int platform_get_irq(struct platform_device *, unsigned int); | ||
419 | extern struct resource *platform_get_resource_byname(struct platform_device *, unsigned int, char *); | ||
420 | extern int platform_get_irq_byname(struct platform_device *, char *); | ||
421 | extern int platform_add_devices(struct platform_device **, int); | ||
422 | |||
423 | extern struct platform_device *platform_device_register_simple(char *, unsigned int, struct resource *, unsigned int); | ||
424 | |||
425 | /* drivers/base/power.c */ | 399 | /* drivers/base/power.c */ |
426 | extern void device_shutdown(void); | 400 | extern void device_shutdown(void); |
427 | 401 | ||
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index 317a979b24de..2b799d40d669 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #define _LINUX_SERIAL_8250_H | 12 | #define _LINUX_SERIAL_8250_H |
13 | 13 | ||
14 | #include <linux/serial_core.h> | 14 | #include <linux/serial_core.h> |
15 | #include <linux/device.h> | 15 | #include <linux/platform_device.h> |
16 | 16 | ||
17 | /* | 17 | /* |
18 | * This is the platform device platform_data structure | 18 | * This is the platform device platform_data structure |