diff options
-rw-r--r-- | drivers/cpuidle/sysfs.c | 7 | ||||
-rw-r--r-- | include/linux/cpuidle.h | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index ed87399bb02b..f15c1e56e16f 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c | |||
@@ -297,6 +297,13 @@ static struct attribute *cpuidle_state_default_attrs[] = { | |||
297 | NULL | 297 | NULL |
298 | }; | 298 | }; |
299 | 299 | ||
300 | struct cpuidle_state_kobj { | ||
301 | struct cpuidle_state *state; | ||
302 | struct cpuidle_state_usage *state_usage; | ||
303 | struct completion kobj_unregister; | ||
304 | struct kobject kobj; | ||
305 | }; | ||
306 | |||
300 | #define kobj_to_state_obj(k) container_of(k, struct cpuidle_state_kobj, kobj) | 307 | #define kobj_to_state_obj(k) container_of(k, struct cpuidle_state_kobj, kobj) |
301 | #define kobj_to_state(k) (kobj_to_state_obj(k)->state) | 308 | #define kobj_to_state(k) (kobj_to_state_obj(k)->state) |
302 | #define kobj_to_state_usage(k) (kobj_to_state_obj(k)->state_usage) | 309 | #define kobj_to_state_usage(k) (kobj_to_state_obj(k)->state_usage) |
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 279b1eaa8b73..7daf0e3b93bd 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h | |||
@@ -82,13 +82,6 @@ cpuidle_set_statedata(struct cpuidle_state_usage *st_usage, void *data) | |||
82 | st_usage->driver_data = data; | 82 | st_usage->driver_data = data; |
83 | } | 83 | } |
84 | 84 | ||
85 | struct cpuidle_state_kobj { | ||
86 | struct cpuidle_state *state; | ||
87 | struct cpuidle_state_usage *state_usage; | ||
88 | struct completion kobj_unregister; | ||
89 | struct kobject kobj; | ||
90 | }; | ||
91 | |||
92 | struct cpuidle_device { | 85 | struct cpuidle_device { |
93 | unsigned int registered:1; | 86 | unsigned int registered:1; |
94 | unsigned int enabled:1; | 87 | unsigned int enabled:1; |