Patched in Tegra support.

1 files changed, 33 insertions, 11 deletions

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 939b11268c8..668729cc0fe 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -72,8 +72,8 @@ struct kobject {
         unsigned int uevent_suppress:1;
 };
 
-extern __printf(2, 3)
-int kobject_set_name(struct kobject *kobj, const char *name, ...);
+extern int kobject_set_name(struct kobject *kobj, const char *name, ...)
+                            __attribute__((format(printf, 2, 3)));
 extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
                                   va_list vargs);
 
@@ -83,13 +83,15 @@ static inline const char *kobject_name(const struct kobject *kobj)
 }
 
 extern void kobject_init(struct kobject *kobj, struct kobj_type *ktype);
-extern __printf(3, 4) __must_check
-int kobject_add(struct kobject *kobj, struct kobject *parent,
-                const char *fmt, ...);
-extern __printf(4, 5) __must_check
-int kobject_init_and_add(struct kobject *kobj,
-                         struct kobj_type *ktype, struct kobject *parent,
-                         const char *fmt, ...);
+extern int __must_check kobject_add(struct kobject *kobj,
+                                    struct kobject *parent,
+                                    const char *fmt, ...)
+        __attribute__((format(printf, 3, 4)));
+extern int __must_check kobject_init_and_add(struct kobject *kobj,
+                                             struct kobj_type *ktype,
+                                             struct kobject *parent,
+                                             const char *fmt, ...)
+        __attribute__((format(printf, 4, 5)));
 
 extern void kobject_del(struct kobject *kobj);
 
@@ -191,6 +193,8 @@ static inline struct kobj_type *get_ktype(struct kobject *kobj)
 }
 
 extern struct kobject *kset_find_obj(struct kset *, const char *);
+extern struct kobject *kset_find_obj_hinted(struct kset *, const char *,
+                                                struct kobject *);
 
 /* The global /sys/kernel/ kobject for people to chain off of */
 extern struct kobject *kernel_kobj;
@@ -203,14 +207,32 @@ extern struct kobject *power_kobj;
 /* The global /sys/firmware/ kobject for people to chain off of */
 extern struct kobject *firmware_kobj;
 
+#if defined(CONFIG_HOTPLUG)
 int kobject_uevent(struct kobject *kobj, enum kobject_action action);
 int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                         char *envp[]);
 
-__printf(2, 3)
-int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...);
+int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
+        __attribute__((format (printf, 2, 3)));
 
 int kobject_action_type(const char *buf, size_t count,
                         enum kobject_action *type);
+#else
+static inline int kobject_uevent(struct kobject *kobj,
+                                 enum kobject_action action)
+{ return 0; }
+static inline int kobject_uevent_env(struct kobject *kobj,
+                                      enum kobject_action action,
+                                      char *envp[])
+{ return 0; }
+
+static inline __attribute__((format(printf, 2, 3)))
+int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
+{ return 0; }
+
+static inline int kobject_action_type(const char *buf, size_t count,
+                                      enum kobject_action *type)
+{ return -EINVAL; }
+#endif
 
 #endif /* _KOBJECT_H_ */