driver core: Introduce device_find_child().

[deliverable/linux.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index b00e027113930900956afe2902b54422088f6c37..0a0370c74181a1d0cabcacd680725020497c7c40 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -21,6 +21,7 @@
 #include <linux/pm.h>
 #include <asm/semaphore.h>
 #include <asm/atomic.h>
+#include <asm/device.h>
 
 #define DEVICE_NAME_SIZE       50
 #define DEVICE_NAME_HALF       __stringify(20) /* Less than half to accommodate slop */
@@ -368,8 +369,6 @@ struct device {
        void            *driver_data;   /* data private to the driver */
        void            *platform_data; /* Platform specific data, device
                                           core doesn't touch it */
-       void            *firmware_data; /* Firmware specific data (e.g. ACPI,
-                                          BIOS data),reserved for device core*/
        struct dev_pm_info      power;
 
        u64             *dma_mask;      /* dma mask (if dma'able device) */
@@ -383,6 +382,8 @@ struct device {
 
        struct dma_coherent_mem *dma_mem; /* internal for coherent mem
                                             override */
+       /* arch specific additions */
+       struct dev_archdata     archdata;
 
        /* class_device migration path */
        struct list_head        node;
@@ -420,6 +421,8 @@ extern int __must_check device_add(struct device * dev);
 extern void device_del(struct device * dev);
 extern int device_for_each_child(struct device *, void *,
                     int (*fn)(struct device *, void *));
+extern struct device *device_find_child(struct device *, void *data,
+                                       int (*match)(struct device *, void *));
 extern int device_rename(struct device *dev, char *new_name);
 
 /*
@@ -440,8 +443,6 @@ extern struct device *device_create(struct class *cls, struct device *parent,
                                    __attribute__((format(printf,4,5)));
 extern void device_destroy(struct class *cls, dev_t devt);
 
-extern int virtual_device_parent(struct device *dev);
-
 /*
  * Platform "fixup" functions - allow the platform to have their say
  * about devices and actions that the general device layer doesn't