android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPI: elide a non-zero test on a result that is never 0

Browse Source 
thermal_cooling_device_register used to return NULL if THERMAL is "n".
As the ACPI fan, processor and video drivers SELECT the generic
thermal in PATCH 01, this is not a problem any more.

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Julia Lawall 2008-04-11 10:09:24 +08:00 committed by Len Brown
parent e9ae71078b
commit 9030062f3d
4 changed files with 51 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/acpi/fan.c
View File

@ -260,24 +260,23 @@ static int acpi_fan_add(struct acpi_device *device)
result = PTR_ERR(cdev); result = PTR_ERR(cdev);
goto end; goto end;
} }
if (cdev) {
printk(KERN_INFO PREFIX
"%s is registered as cooling_device%d\n",
device->dev.bus_id, cdev->id);
acpi_driver_data(device) = cdev; printk(KERN_INFO PREFIX
result = sysfs_create_link(&device->dev.kobj, "%s is registered as cooling_device%d\n",
&cdev->device.kobj, device->dev.bus_id, cdev->id);
"thermal_cooling");
if (result)
return result;
result = sysfs_create_link(&cdev->device.kobj, acpi_driver_data(device) = cdev;
&device->dev.kobj, result = sysfs_create_link(&device->dev.kobj,
"device"); &cdev->device.kobj,
if (result) "thermal_cooling");
return result; if (result)
} printk(KERN_ERR PREFIX "Create sysfs link\n");
result = sysfs_create_link(&cdev->device.kobj,
&device->dev.kobj,
"device");
if (result)
printk(KERN_ERR PREFIX "Create sysfs link\n");
result = acpi_fan_add_fs(device); result = acpi_fan_add_fs(device);
if (result) if (result)

29
drivers/acpi/processor_core.c
View File

@ -674,22 +674,21 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
result = PTR_ERR(pr->cdev); result = PTR_ERR(pr->cdev);
goto end; goto end;
} }
if (pr->cdev) {
printk(KERN_INFO PREFIX
"%s is registered as cooling_device%d\n",
device->dev.bus_id, pr->cdev->id);
result = sysfs_create_link(&device->dev.kobj, printk(KERN_INFO PREFIX
&pr->cdev->device.kobj, "%s is registered as cooling_device%d\n",
"thermal_cooling"); device->dev.bus_id, pr->cdev->id);
if (result)
return result; result = sysfs_create_link(&device->dev.kobj,
result = sysfs_create_link(&pr->cdev->device.kobj, &pr->cdev->device.kobj,
&device->dev.kobj, "thermal_cooling");
"device"); if (result)
if (result) printk(KERN_ERR PREFIX "Create sysfs link\n");
return result; result = sysfs_create_link(&pr->cdev->device.kobj,
} &device->dev.kobj,
"device");
if (result)
printk(KERN_ERR PREFIX "Create sysfs link\n");
if (pr->flags.throttling) { if (pr->flags.throttling) {
printk(KERN_INFO PREFIX "%s [%s] (supports", printk(KERN_INFO PREFIX "%s [%s] (supports",

28
drivers/acpi/video.c
View File

@ -734,21 +734,19 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
if (IS_ERR(device->cdev)) if (IS_ERR(device->cdev))
return; return;
if (device->cdev) { printk(KERN_INFO PREFIX
printk(KERN_INFO PREFIX "%s is registered as cooling_device%d\n",
"%s is registered as cooling_device%d\n", device->dev->dev.bus_id, device->cdev->id);
device->dev->dev.bus_id, device->cdev->id); result = sysfs_create_link(&device->dev->dev.kobj,
result = sysfs_create_link(&device->dev->dev.kobj, &device->cdev->device.kobj,
&device->cdev->device.kobj, "thermal_cooling");
"thermal_cooling"); if (result)
if (result) printk(KERN_ERR PREFIX "Create sysfs link\n");
printk(KERN_ERR PREFIX "Create sysfs link\n"); result = sysfs_create_link(&device->cdev->device.kobj,
result = sysfs_create_link(&device->cdev->device.kobj, &device->dev->dev.kobj, "device");
&device->dev->dev.kobj, if (result)
"device"); printk(KERN_ERR PREFIX "Create sysfs link\n");
if (result)
printk(KERN_ERR PREFIX "Create sysfs link\n");
}
} }
if (device->cap._DCS && device->cap._DSS){ if (device->cap._DCS && device->cap._DSS){
static int count = 0; static int count = 0;

23
drivers/misc/intel_menlow.c
View File

@ -175,20 +175,15 @@ static int intel_menlow_memory_add(struct acpi_device *device)
goto end; goto end;
} }
if (cdev) { acpi_driver_data(device) = cdev;
acpi_driver_data(device) = cdev; result = sysfs_create_link(&device->dev.kobj,
result = sysfs_create_link(&device->dev.kobj, &cdev->device.kobj, "thermal_cooling");
&cdev->device.kobj, "thermal_cooling"); if (result)
if (result) printk(KERN_ERR PREFIX "Create sysfs link\n");
goto unregister; result = sysfs_create_link(&cdev->device.kobj,
&device->dev.kobj, "device");
result = sysfs_create_link(&cdev->device.kobj, if (result)
&device->dev.kobj, "device"); printk(KERN_ERR PREFIX "Create sysfs link\n");
if (result) {
sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
goto unregister;
}
}
end: end:
return result; return result;