* [PATCH] ARM: s3c: fix s3c64xx_set_timer_source prototype
@ 2023-01-18 9:02 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2023-01-18 9:02 UTC (permalink / raw)
To: Krzysztof Kozlowski, Daniel Lezcano, Tomasz Figa,
Sylwester Nawrocki, Arnd Bergmann
Cc: Russell King, Alim Akhtar, Heiko Stuebner, linux-arm-kernel,
linux-samsung-soc, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
The prototype does not match the definition, as gcc-13 points
out:
arch/arm/mach-s3c/s3c64xx.c:169:13: error: conflicting types for 's3c64xx_set_timer_source' due to enum/integer mismatch; have 'void(unsigned int, unsigned int)' [-Werror=enum-int-mismatch]
169 | void __init s3c64xx_set_timer_source(unsigned int event, unsigned int source)
| ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from arch/arm/mach-s3c/s3c64xx.c:50:
arch/arm/mach-s3c/s3c64xx.h:62:20: note: previous declaration of 's3c64xx_set_timer_source' with type 'void(enum s3c64xx_timer_mode, enum s3c64xx_timer_mode)'
62 | extern void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
| ^~~~~~~~~~~~~~~~~~~~~~~~
Fixes: 4280506ac9bb ("ARM: SAMSUNG: Move all platforms to new clocksource driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-s3c/s3c64xx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c
index 32b1bc82d700..c5aa4d8ed8bd 100644
--- a/arch/arm/mach-s3c/s3c64xx.c
+++ b/arch/arm/mach-s3c/s3c64xx.c
@@ -166,7 +166,8 @@ static struct samsung_pwm_platform_data s3c64xx_pwm_variant = {
.tclk_mask = (1 << 7) | (1 << 6) | (1 << 5),
};
-void __init s3c64xx_set_timer_source(unsigned int event, unsigned int source)
+void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
+ enum s3c64xx_timer_mode source)
{
s3c64xx_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
s3c64xx_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
--
2.39.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: s3c: fix s3c64xx_set_timer_source prototype
@ 2023-01-18 9:02 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2023-01-18 9:02 UTC (permalink / raw)
To: Krzysztof Kozlowski, Daniel Lezcano, Tomasz Figa,
Sylwester Nawrocki, Arnd Bergmann
Cc: Russell King, Alim Akhtar, Heiko Stuebner, linux-arm-kernel,
linux-samsung-soc, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
The prototype does not match the definition, as gcc-13 points
out:
arch/arm/mach-s3c/s3c64xx.c:169:13: error: conflicting types for 's3c64xx_set_timer_source' due to enum/integer mismatch; have 'void(unsigned int, unsigned int)' [-Werror=enum-int-mismatch]
169 | void __init s3c64xx_set_timer_source(unsigned int event, unsigned int source)
| ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from arch/arm/mach-s3c/s3c64xx.c:50:
arch/arm/mach-s3c/s3c64xx.h:62:20: note: previous declaration of 's3c64xx_set_timer_source' with type 'void(enum s3c64xx_timer_mode, enum s3c64xx_timer_mode)'
62 | extern void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
| ^~~~~~~~~~~~~~~~~~~~~~~~
Fixes: 4280506ac9bb ("ARM: SAMSUNG: Move all platforms to new clocksource driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-s3c/s3c64xx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c
index 32b1bc82d700..c5aa4d8ed8bd 100644
--- a/arch/arm/mach-s3c/s3c64xx.c
+++ b/arch/arm/mach-s3c/s3c64xx.c
@@ -166,7 +166,8 @@ static struct samsung_pwm_platform_data s3c64xx_pwm_variant = {
.tclk_mask = (1 << 7) | (1 << 6) | (1 << 5),
};
-void __init s3c64xx_set_timer_source(unsigned int event, unsigned int source)
+void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
+ enum s3c64xx_timer_mode source)
{
s3c64xx_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
s3c64xx_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
--
2.39.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: s3c: fix s3c64xx_set_timer_source prototype
2023-01-18 9:02 ` Arnd Bergmann
@ 2023-01-20 7:24 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-20 7:24 UTC (permalink / raw)
To: Tomasz Figa, Daniel Lezcano, Sylwester Nawrocki, Arnd Bergmann,
Arnd Bergmann
Cc: Krzysztof Kozlowski, linux-samsung-soc, Alim Akhtar,
Heiko Stuebner, linux-arm-kernel, linux-kernel, Russell King
On Wed, 18 Jan 2023 10:02:12 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The prototype does not match the definition, as gcc-13 points
> out:
>
> arch/arm/mach-s3c/s3c64xx.c:169:13: error: conflicting types for 's3c64xx_set_timer_source' due to enum/integer mismatch; have 'void(unsigned int, unsigned int)' [-Werror=enum-int-mismatch]
> 169 | void __init s3c64xx_set_timer_source(unsigned int event, unsigned int source)
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> In file included from arch/arm/mach-s3c/s3c64xx.c:50:
> arch/arm/mach-s3c/s3c64xx.h:62:20: note: previous declaration of 's3c64xx_set_timer_source' with type 'void(enum s3c64xx_timer_mode, enum s3c64xx_timer_mode)'
> 62 | extern void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
> | ^~~~~~~~~~~~~~~~~~~~~~~~
>
> [...]
Applied, thanks!
[1/1] ARM: s3c: fix s3c64xx_set_timer_source prototype
https://git.kernel.org/krzk/linux/c/5bf52f5e4d12b8109f348cab60cb7d51092c4270
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: s3c: fix s3c64xx_set_timer_source prototype
@ 2023-01-20 7:24 ` Krzysztof Kozlowski
0 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2023-01-20 7:24 UTC (permalink / raw)
To: Tomasz Figa, Daniel Lezcano, Sylwester Nawrocki, Arnd Bergmann,
Arnd Bergmann
Cc: Krzysztof Kozlowski, linux-samsung-soc, Alim Akhtar,
Heiko Stuebner, linux-arm-kernel, linux-kernel, Russell King
On Wed, 18 Jan 2023 10:02:12 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The prototype does not match the definition, as gcc-13 points
> out:
>
> arch/arm/mach-s3c/s3c64xx.c:169:13: error: conflicting types for 's3c64xx_set_timer_source' due to enum/integer mismatch; have 'void(unsigned int, unsigned int)' [-Werror=enum-int-mismatch]
> 169 | void __init s3c64xx_set_timer_source(unsigned int event, unsigned int source)
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> In file included from arch/arm/mach-s3c/s3c64xx.c:50:
> arch/arm/mach-s3c/s3c64xx.h:62:20: note: previous declaration of 's3c64xx_set_timer_source' with type 'void(enum s3c64xx_timer_mode, enum s3c64xx_timer_mode)'
> 62 | extern void __init s3c64xx_set_timer_source(enum s3c64xx_timer_mode event,
> | ^~~~~~~~~~~~~~~~~~~~~~~~
>
> [...]
Applied, thanks!
[1/1] ARM: s3c: fix s3c64xx_set_timer_source prototype
https://git.kernel.org/krzk/linux/c/5bf52f5e4d12b8109f348cab60cb7d51092c4270
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-20 7:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-18 9:02 [PATCH] ARM: s3c: fix s3c64xx_set_timer_source prototype Arnd Bergmann
2023-01-18 9:02 ` Arnd Bergmann
2023-01-20 7:24 ` Krzysztof Kozlowski
2023-01-20 7:24 ` Krzysztof Kozlowski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.