From: Hanjun Guo Date: Fri, 13 Nov 2020 02:25:10 +0000 (+0800) Subject: ACPI: SBS: Simplify the driver init code X-Git-Tag: v5.11-rc1~150^2~1^3~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dff714087c40644d225094a1f75d2272cc8a4885;p=thirdparty%2Fkernel%2Flinux.git ACPI: SBS: Simplify the driver init code acpi_bus_register_driver() will check acpi_disable and return -ENODEV, so the acpi_disable check outside the acpi_bus_register_driver() is duplicated, can be removed. Also we can just return from acpi_bus_register_driver() then we can simplify the code further. Signed-off-by: Hanjun Guo Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index e6d9f4de28000..cbd1af7ce7f43 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -714,16 +714,7 @@ static struct acpi_driver acpi_sbs_driver = { static int __init acpi_sbs_init(void) { - int result = 0; - - if (acpi_disabled) - return -ENODEV; - - result = acpi_bus_register_driver(&acpi_sbs_driver); - if (result < 0) - return -ENODEV; - - return 0; + return acpi_bus_register_driver(&acpi_sbs_driver); } static void __exit acpi_sbs_exit(void)