summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-01-11 17:50:22 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-01-12 15:58:49 +0100
commitb6c55b162bcee62c43c18e59f38a4590be543032 (patch)
treeb8d8f8533196d403bbec1332a2d4155885022e08 /drivers/acpi/scan.c
parentMerge tag 'acpi-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff)
downloadlinux-b6c55b162bcee62c43c18e59f38a4590be543032.tar.xz
linux-b6c55b162bcee62c43c18e59f38a4590be543032.zip
ACPI: scan: Change acpi_scan_init() return value type to void
The only caller of acpi_scan_init(), acpi_init(), doesn't check its return value, so turn it into a void function. This avoids complaints from the Smatch static checker that the function should return a negative error code when it fails, which is not really a problem in this particular case. No intentional functional impact. Link: https://lore.kernel.org/linux-acpi/20220106082317.GA9123@kili/ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 1185ecea59d1..7e7417f4df22 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2542,9 +2542,8 @@ static void __init acpi_get_spcr_uart_addr(void)
static bool acpi_scan_initialized;
-int __init acpi_scan_init(void)
+void __init acpi_scan_init(void)
{
- int result;
acpi_status status;
struct acpi_table_stao *stao_ptr;
@@ -2594,8 +2593,7 @@ int __init acpi_scan_init(void)
/*
* Enumerate devices in the ACPI namespace.
*/
- result = acpi_bus_scan(ACPI_ROOT_OBJECT);
- if (result)
+ if (acpi_bus_scan(ACPI_ROOT_OBJECT))
goto out;
acpi_root = acpi_fetch_acpi_dev(ACPI_ROOT_OBJECT);
@@ -2604,8 +2602,7 @@ int __init acpi_scan_init(void)
/* Fixed feature devices do not exist on HW-reduced platform */
if (!acpi_gbl_reduced_hardware) {
- result = acpi_bus_scan_fixed();
- if (result) {
+ if (acpi_bus_scan_fixed()) {
acpi_detach_data(acpi_root->handle,
acpi_scan_drop_device);
acpi_device_del(acpi_root);
@@ -2620,7 +2617,6 @@ int __init acpi_scan_init(void)
out:
mutex_unlock(&acpi_scan_lock);
- return result;
}
static struct acpi_probe_entry *ape;