Merge HEAD from ../scsi-misc-2.6-tmp

This commit is contained in:
James Bottomley
2005-08-28 11:18:35 -05:00
72 changed files with 3837 additions and 8035 deletions

View File

@@ -11,10 +11,12 @@
#include <linux/device.h>
#include <linux/list.h>
#include <linux/spinlock.h>
struct attribute_container {
struct list_head node;
struct list_head containers;
spinlock_t containers_lock;
struct class *class;
struct class_device_attribute **attrs;
int (*match)(struct attribute_container *, struct device *);
@@ -62,12 +64,8 @@ int attribute_container_add_class_device_adapter(struct attribute_container *con
struct class_device *classdev);
void attribute_container_remove_attrs(struct class_device *classdev);
void attribute_container_class_device_del(struct class_device *classdev);
struct attribute_container *attribute_container_classdev_to_container(struct class_device *);
struct class_device *attribute_container_find_class_device(struct attribute_container *, struct device *);
struct class_device_attribute **attribute_container_classdev_to_attrs(const struct class_device *classdev);
#endif

View File

@@ -12,11 +12,16 @@
#include <linux/device.h>
#include <linux/attribute_container.h>
struct transport_container;
struct transport_class {
struct class class;
int (*setup)(struct device *);
int (*configure)(struct device *);
int (*remove)(struct device *);
int (*setup)(struct transport_container *, struct device *,
struct class_device *);
int (*configure)(struct transport_container *, struct device *,
struct class_device *);
int (*remove)(struct transport_container *, struct device *,
struct class_device *);
};
#define DECLARE_TRANSPORT_CLASS(cls, nm, su, rm, cfg) \