diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:37:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:37:14 +0100 |
| commit | b2b062b8163391c42b3219d466ca1ac9742b9c7b (patch) | |
| tree | f3f920c09b8de694b1bc1d4b878cfd2b0b98c913 /drivers/thermal/thermal_sys.c | |
| parent | Merge branch 'linus' into stackprotector (diff) | |
| parent | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/... (diff) | |
| download | linux-b2b062b8163391c42b3219d466ca1ac9742b9c7b.tar.xz linux-b2b062b8163391c42b3219d466ca1ac9742b9c7b.zip | |
Merge branch 'core/percpu' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/thermal/thermal_sys.c')
| -rw-r--r-- | drivers/thermal/thermal_sys.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index fe07462d5947..8171ca17b936 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -579,7 +579,7 @@ static void thermal_release(struct device *dev) struct thermal_zone_device *tz; struct thermal_cooling_device *cdev; - if (!strncmp(dev->bus_id, "thermal_zone", sizeof "thermal_zone" - 1)) { + if (!strncmp(dev_name(dev), "thermal_zone", sizeof "thermal_zone" - 1)) { tz = to_thermal_zone(dev); kfree(tz); } else { @@ -630,7 +630,7 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *type, cdev->ops = ops; cdev->device.class = &thermal_class; cdev->devdata = devdata; - sprintf(cdev->device.bus_id, "cooling_device%d", cdev->id); + dev_set_name(&cdev->device, "cooling_device%d", cdev->id); result = device_register(&cdev->device); if (result) { release_idr(&thermal_cdev_idr, &thermal_idr_lock, cdev->id); @@ -769,7 +769,7 @@ struct thermal_zone_device *thermal_zone_device_register(char *type, tz->device.class = &thermal_class; tz->devdata = devdata; tz->trips = trips; - sprintf(tz->device.bus_id, "thermal_zone%d", tz->id); + dev_set_name(&tz->device, "thermal_zone%d", tz->id); result = device_register(&tz->device); if (result) { release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id); |