Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / include / linux / raid_class.h

diff --git a/include/linux/raid_class.h b/include/linux/raid_class.h
index d0dd38b..6b537f1 100644 (file)
--- a/include/linux/raid_class.h
+++ b/include/linux/raid_class.h
@@ -53,20 +53,20 @@ struct raid_data {
 #define DEFINE_RAID_ATTRIBUTE(type, attr)                                    \
 static inline void                                                           \
 raid_set_##attr(struct raid_template *r, struct device *dev, type value) {    \
-       struct class_device *cdev =                                           \
+       struct device *device =                                               \
                attribute_container_find_class_device(&r->raid_attrs.ac, dev);\
        struct raid_data *rd;                                                 \
-       BUG_ON(!cdev);                                                        \
-       rd = class_get_devdata(cdev);                                         \
+       BUG_ON(!device);                                                      \
+       rd = dev_get_drvdata(device);                                         \
        rd->attr = value;                                                     \
 }                                                                            \
 static inline type                                                           \
 raid_get_##attr(struct raid_template *r, struct device *dev) {               \
-       struct class_device *cdev =                                           \
+       struct device *device =                                               \
                attribute_container_find_class_device(&r->raid_attrs.ac, dev);\
        struct raid_data *rd;                                                 \
-       BUG_ON(!cdev);                                                        \
-       rd = class_get_devdata(cdev);                                         \
+       BUG_ON(!device);                                                      \
+       rd = dev_get_drvdata(device);                                         \
        return rd->attr;                                                      \
 }
 
@@ -77,5 +77,6 @@ DEFINE_RAID_ATTRIBUTE(enum raid_state, state)
 struct raid_template *raid_class_attach(struct raid_function_template *);
 void raid_class_release(struct raid_template *);
 
-void raid_component_add(struct raid_template *, struct device *,
-                       struct device *);
+int __must_check raid_component_add(struct raid_template *, struct device *,
+                                   struct device *);
+