1 files changed, 6 insertions, 5 deletions

diff --git a/include/linux/transport_class.h b/include/linux/transport_class.h
index 1d6cc22e5f42..eaec1ea9558e 100644
--- a/include/linux/transport_class.h
+++ b/include/linux/transport_class.h
@@ -17,11 +17,11 @@ struct transport_container;
 struct transport_class {
         struct class class;
         int (*setup)(struct transport_container *, struct device *,
-                     struct class_device *);
+                     struct device *);
         int (*configure)(struct transport_container *, struct device *,
-                         struct class_device *);
+                         struct device *);
         int (*remove)(struct transport_container *, struct device *,
-                      struct class_device *);
+                      struct device *);
 };
 
 #define DECLARE_TRANSPORT_CLASS(cls, nm, su, rm, cfg)                   \
@@ -86,9 +86,10 @@ static inline int transport_container_register(struct transport_container *tc)
         return attribute_container_register(&tc->ac);
 }
 
-static inline int transport_container_unregister(struct transport_container *tc)
+static inline void transport_container_unregister(struct transport_container *tc)
 {
-        return attribute_container_unregister(&tc->ac);
+        if (unlikely(attribute_container_unregister(&tc->ac)))
+                BUG();
 }
 
 int transport_class_register(struct transport_class *);