Skip to content

Commit 10fd7c4

Browse files
Gavin Shanwilldeacon
authored andcommitted
firmware: arm_sdei: Avoid nested statements in sdei_init()
In sdei_init(), the nested statements can be avoided by bailing on error from platform_driver_register() or absent ACPI SDEI table. With it, the code looks a bit more readable. Signed-off-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: James Morse <james.morse@arm.com> Link: https://lore.kernel.org/r/20200922130423.10173-5-gshan@redhat.com Signed-off-by: Will Deacon <will@kernel.org>
1 parent 663c0e8 commit 10fd7c4

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

drivers/firmware/arm_sdei.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,17 +1081,18 @@ static bool __init sdei_present_acpi(void)
10811081

10821082
static int __init sdei_init(void)
10831083
{
1084-
int ret = platform_driver_register(&sdei_driver);
1085-
1086-
if (!ret && sdei_present_acpi()) {
1087-
struct platform_device *pdev;
1088-
1089-
pdev = platform_device_register_simple(sdei_driver.driver.name,
1090-
0, NULL, 0);
1091-
if (IS_ERR(pdev))
1092-
pr_info("Failed to register ACPI:SDEI platform device %ld\n",
1093-
PTR_ERR(pdev));
1094-
}
1084+
struct platform_device *pdev;
1085+
int ret;
1086+
1087+
ret = platform_driver_register(&sdei_driver);
1088+
if (ret || !sdei_present_acpi())
1089+
return ret;
1090+
1091+
pdev = platform_device_register_simple(sdei_driver.driver.name,
1092+
0, NULL, 0);
1093+
if (IS_ERR(pdev))
1094+
pr_info("Failed to register ACPI:SDEI platform device %ld\n",
1095+
PTR_ERR(pdev));
10951096

10961097
return ret;
10971098
}

0 commit comments

Comments
 (0)