xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPI / scan: Make it clear that acpi_bus_trim() cannot fail

Browse Source 
Since acpi_bus_trim() cannot fail, change its definition to a void
function, so that its callers don't check the return value in vain
and update the callers.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
This commit is contained in:
Rafael J. Wysocki
2013-01-26 00:27:44 +01:00
parent b8bd759acd
commit bfee26dba0
4 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pci/hotplug/acpiphp_glue.c
View File

@@ -742,8 +742,7 @@ static int acpiphp_bus_add(struct acpiphp_func *func)
/* this shouldn't be in here, so remove
* the bus then re-add it...
*/
ret_val = acpi_bus_trim(device);
dbg("acpi_bus_trim return %x\n", ret_val);
acpi_bus_trim(device);
}
ret_val = acpi_bus_scan(func->handle);
@@ -772,11 +771,8 @@ static int acpiphp_bus_trim(acpi_handle handle)
return retval;
}
retval = acpi_bus_trim(device);
if (retval)
err("cannot remove from acpi list\n");
return retval;
acpi_bus_trim(device);
return 0;
}
static void acpiphp_set_acpi_region(struct acpiphp_slot *slot)