Skip to contentSkip to conversation

firmware: efi: arm-runtime: fix build error void value not ignored

PATCH In review Anders Roxell 2 participants 2 messages Feb 4, 2019 EFI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware: efi: arm-runtime: fix build error void value not ignored

Commit e2a2e56e4082 ("arm64: dump: no need to check return value of debugfs_create functions") changed the return value from 'int' to 'void'.

../drivers/firmware/efi/arm-runtime.c: In function ‘ptdump_init’:
../drivers/firmware/efi/arm-runtime.c:52:9: error: void value not ignored as it ought to be

  return ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

../drivers/firmware/efi/arm-runtime.c:53:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^

Rework so that function 'ptdump_init' doesn't 'return ptdump_debug_fs_register(...' since the function can work or not, but the code logic should never do something different based on this.

---
 drivers/firmware/efi/arm-runtime.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/firmware/efi/arm-runtime.c +2 -1
index 352bd2473162..b9ae798192d6 100644
@@ -49,7 +49,8 @@ static int __init ptdump_init(void)
 	if (!efi_enabled(EFI_RUNTIME_SERVICES))
 		return 0;
 
-	return ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
+	ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
+	return 0;
 }
 device_initcall(ptdump_init);
 
Signature · 1 line
2.20.1
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Anders Roxell

Commit e2a2e56e4082 ("arm64: dump: no need to check return value of debugfs_create functions") changed the return value from 'int' to 'void'.

../drivers/firmware/efi/arm-runtime.c: In function ‘ptdump_init’:
../drivers/firmware/efi/arm-runtime.c:52:9: error: void value not ignored as it ought to be

  return ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

../drivers/firmware/efi/arm-runtime.c:53:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^

Quoted 5 lines

Rework so that function 'ptdump_init' doesn't 'return ptdump_debug_fs_register(...' since the function can work or not, but the code logic should never do something different based on this.

Hi Anders,

Thanks for the fix.

Someone else spotted the same bug, and sent a similar fix, and I asked Will or Catalin to take it through the arm64 for-next tree since this is where the offending patch lives.

So for either this patch or for the other one

Quoted 21 lines
---
 drivers/firmware/efi/arm-runtime.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/firmware/efi/arm-runtime.c +2 -2
index 352bd2473162..b9ae798192d6 100644
@@ -49,7 +49,8 @@ static int __init ptdump_init(void)
        if (!efi_enabled(EFI_RUNTIME_SERVICES))
                return 0;
 
-       return ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
+       ptdump_debugfs_register(&efi_ptdump_info, "efi_page_tables");
+       return 0;
 }
 device_initcall(ptdump_init);
 
--

2.20.1