| Message ID | 1605234311-29912-1-git-send-email-guohanjun@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/2] ACPI: SBS: Simplify the driver init code | expand |
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index e6d9f4d..cbd1af7 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -714,16 +714,7 @@ static int acpi_sbs_resume(struct device *dev) 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)
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 <guohanjun@huawei.com> --- drivers/acpi/sbs.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)