[PATCH 1/4] make cdev attribuition the last step

Glauber Costa
2008-02-18T21:04:22Z

This patch uses a temporary variable "cdev" instead of using
directly pr->cdev. Through it, we can tell later whether or not
this code was completed properly: by checking for pr->cdev != NULL
Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
drivers/acpi/processor_core.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 75ccf5d..9480203 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -622,7 +622,7 @@ static int __cpuinit acpi_processor_star
int result = 0;
acpi_status status = AE_OK;
struct acpi_processor *pr;
-
+ struct thermal_cooling_device *cdev;

pr = acpi_driver_data(device);

@@ -668,24 +668,26 @@ #endif

acpi_processor_power_init(pr, device);

- pr->cdev = thermal_cooling_device_register("Processor", device,
+ cdev = thermal_cooling_device_register("Processor", device,
&processor_cooling_ops);
- if (pr->cdev)
+ if (cdev)
printk(KERN_INFO PREFIX
"%s is registered as cooling_device%d\n",
- device->dev.bus_id, pr->cdev->id);
+ device->dev.bus_id, cdev->id);
else
goto end;

- result = sysfs_create_link(&device->dev.kobj, &pr->cdev->device.kobj,
+ result = sysfs_create_link(&device->dev.kobj, &cdev->device.kobj,
"thermal_cooling");
if (result)
return result;
- result = sysfs_create_link(&pr->cdev->device.kobj, &device->dev.kobj,
+ result = sysfs_create_link(&cdev->device.kobj, &device->dev.kobj,
"device");
if (result)
return result;

+ pr->cdev = cdev;
+
if (pr->flags.throttling) {
printk(KERN_INFO PREFIX "%s [%s] (supports",
acpi_device_name(device), acpi_device_bid(device));
--
1.4.2