diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2007-12-19 20:09:39 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 23:40:40 -0500 |
commit | af5ca3f4ec5cc4432a42a73b050dd8898ce8fd00 (patch) | |
tree | 3e5a3081b2802547f10da72c0026b4929d0e287b /kernel/time | |
parent | 528a4bf1d5ffed310d26fc1d82d45c02949f71cf (diff) |
Driver core: change sysdev classes to use dynamic kobject names
All kobjects require a dynamically allocated name now. We no longer
need to keep track if the name is statically assigned, we can just
unconditionally free() all kobject names on cleanup.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/clocksource.c | 2 | ||||
-rw-r--r-- | kernel/time/timekeeping.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index c8a9d13874df..8d6125ad2cf0 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -441,7 +441,7 @@ static SYSDEV_ATTR(available_clocksource, 0600, | |||
441 | sysfs_show_available_clocksources, NULL); | 441 | sysfs_show_available_clocksources, NULL); |
442 | 442 | ||
443 | static struct sysdev_class clocksource_sysclass = { | 443 | static struct sysdev_class clocksource_sysclass = { |
444 | set_kset_name("clocksource"), | 444 | .name = "clocksource", |
445 | }; | 445 | }; |
446 | 446 | ||
447 | static struct sys_device device_clocksource = { | 447 | static struct sys_device device_clocksource = { |
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index e5e466b27598..ab46ae8c062b 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -335,9 +335,9 @@ static int timekeeping_suspend(struct sys_device *dev, pm_message_t state) | |||
335 | 335 | ||
336 | /* sysfs resume/suspend bits for timekeeping */ | 336 | /* sysfs resume/suspend bits for timekeeping */ |
337 | static struct sysdev_class timekeeping_sysclass = { | 337 | static struct sysdev_class timekeeping_sysclass = { |
338 | .name = "timekeeping", | ||
338 | .resume = timekeeping_resume, | 339 | .resume = timekeeping_resume, |
339 | .suspend = timekeeping_suspend, | 340 | .suspend = timekeeping_suspend, |
340 | set_kset_name("timekeeping"), | ||
341 | }; | 341 | }; |
342 | 342 | ||
343 | static struct sys_device device_timer = { | 343 | static struct sys_device device_timer = { |