[SCSI] transport_class: BUG if we can't release the attribute container

[linux-2.6-omap-h63xx.git] / include / linux / attribute_container.h

diff --git a/include/linux/attribute_container.h b/include/linux/attribute_container.h
index 93bfb0beb62a9f1903d37e266fcb22b8284cf5ec..574b201b99d8b0f31c268434546c4930ceb94eb7 100644 (file)
--- a/include/linux/attribute_container.h
+++ b/include/linux/attribute_container.h
@@ -12,12 +12,12 @@
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/klist.h>
-#include <linux/spinlock.h>
 
 struct attribute_container {
        struct list_head        node;
        struct klist            containers;
        struct class            *class;
+       struct attribute_group  *grp;
        struct class_device_attribute **attrs;
        int (*match)(struct attribute_container *, struct device *);
 #define        ATTRIBUTE_CONTAINER_NO_CLASSDEVS        0x01
@@ -37,7 +37,7 @@ attribute_container_set_no_classdevs(struct attribute_container *atc)
 }
 
 int attribute_container_register(struct attribute_container *cont);
-int attribute_container_unregister(struct attribute_container *cont);
+int __must_check attribute_container_unregister(struct attribute_container *cont);
 void attribute_container_create_device(struct device *dev,
                                       int (*fn)(struct attribute_container *,
                                                 struct device *,