[PATCH] NFS: Replace nfs_page insertion sort with a radix sort

[safe/jmp/linux-2.6] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index f1c38d8..7b781a7 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -262,10 +262,8 @@ extern void class_device_destroy(struct class *cls, dev_t devt);
 
 
 struct device {
-       struct list_head node;          /* node in sibling list */
-       struct list_head bus_list;      /* node in bus's list */
-       struct list_head driver_list;
-       struct list_head children;
+       struct klist            klist_children;
+       struct klist_node       knode_parent;           /* node in sibling list */
        struct klist_node       knode_driver;
        struct klist_node       knode_bus;
        struct device   * parent;
@@ -300,12 +298,6 @@ struct device {
        void    (*release)(struct device * dev);
 };
 
-static inline struct device *
-list_to_dev(struct list_head *node)
-{
-       return list_entry(node, struct device, node);
-}
-
 static inline void *
 dev_get_drvdata (struct device *dev)
 {
@@ -333,7 +325,6 @@ extern int device_for_each_child(struct device *, void *,
  * Manual binding of a device to driver. See drivers/base/bus.c
  * for information on use.
  */
-extern int  driver_probe_device(struct device_driver * drv, struct device * dev);
 extern void device_bind_driver(struct device * dev);
 extern void device_release_driver(struct device * dev);
 extern int  device_attach(struct device * dev);
@@ -344,8 +335,10 @@ extern void driver_attach(struct device_driver * drv);
 
 struct device_attribute {
        struct attribute        attr;
-       ssize_t (*show)(struct device * dev, char * buf);
-       ssize_t (*store)(struct device * dev, const char * buf, size_t count);
+       ssize_t (*show)(struct device *dev, struct device_attribute *attr,
+                       char *buf);
+       ssize_t (*store)(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count);
 };
 
 #define DEVICE_ATTR(_name,_mode,_show,_store) \