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>

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 1db3a2f..457e11d 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -14,7 +14,7 @@
 int early_acpi_osi_init(void);
 int acpi_osi_init(void);
 acpi_status acpi_os_initialize1(void);
-int acpi_scan_init(void);
+void acpi_scan_init(void);
 #ifdef CONFIG_PCI
 void acpi_pci_root_init(void);
 void acpi_pci_link_init(void);

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 1185ece..7e7417f 100644 (file)
--- 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;