diff mbox series

[u-boot,v4,26/36] ARM: kona: fix clk_bsc_enable() type mismatch for LTO

Message ID 20210520112425.25166-27-marek.behun@nic.cz
State Accepted
Commit 3cd7541f932164db34c82748dc5ead4020a0eb2e
Delegated to: Tom Rini
Headers show
Series U-Boot LTO (Sandbox + Some ARM boards) | expand

Commit Message

Marek Behún May 20, 2021, 11:24 a.m. UTC 
When building with LTO, the compiler complains about type mismatch of
function clk_bsc_enable() in file:
  arch/arm/cpu/armv7/kona-common/clk-stubs.c
vs other files that define or use this function:
  warning: type of ‘clk_bsc_enable’ does not match original declaration.

Change the type of this function to that of the other usages.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---
 arch/arm/cpu/armv7/kona-common/clk-stubs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini May 25, 2021, 12:56 a.m. UTC | #1 
On Thu, May 20, 2021 at 01:24:15PM +0200, Marek Behún wrote:

> When building with LTO, the compiler complains about type mismatch of
> function clk_bsc_enable() in file:
>   arch/arm/cpu/armv7/kona-common/clk-stubs.c
> vs other files that define or use this function:
>   warning: type of ‘clk_bsc_enable’ does not match original declaration.
> 
> Change the type of this function to that of the other usages.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/cpu/armv7/kona-common/clk-stubs.c b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
index 2dfa3f7e73..4eddaca887 100644
--- a/arch/arm/cpu/armv7/kona-common/clk-stubs.c
+++ b/arch/arm/cpu/armv7/kona-common/clk-stubs.c
@@ -14,7 +14,7 @@  int __weak clk_sdio_enable(void *base, u32 rate, u32 *actual_ratep)
 	return 0;
 }
 
-int __weak clk_bsc_enable(void *base, u32 rate, u32 *actual_ratep)
+int __weak clk_bsc_enable(void *base)
 {
 	return 0;
 }