summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c/s3c64xx.c
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2020-08-20 23:42:03 +0300
committerKrzysztof Kozlowski <krzk@kernel.org>2020-08-28 17:38:55 +0300
commita1342f6a9ff88ad88ff7a981c53ae0869c94d243 (patch)
tree0cbc098a8dc96bacbbc215d3e97d0f1602be7b87 /arch/arm/mach-s3c/s3c64xx.c
parent21cfa049290b281530f237bf03e9f4c1038e0f72 (diff)
downloadlinux-a1342f6a9ff88ad88ff7a981c53ae0869c94d243.tar.xz
ARM: s3c: Avoid naming clash of S3C24xx and S3C64xx timer setup
PWM timer initialization has two independent implementations - one for S3C24xx and one for S3C64xx. The naming however was always the same and before also the declaration was shared. This is confusing, error prone and might cause issues when trying to build multiplatform kernel. Suggested-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Link: https://lore.kernel.org/r/20200820204203.22328-1-krzk@kernel.org
Diffstat (limited to 'arch/arm/mach-s3c/s3c64xx.c')
-rw-r--r--arch/arm/mach-s3c/s3c64xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c
index ef79aaf1aced..b5fc615a482f 100644
--- a/arch/arm/mach-s3c/s3c64xx.c
+++ b/arch/arm/mach-s3c/s3c64xx.c
@@ -168,13 +168,13 @@ static struct samsung_pwm_variant s3c64xx_pwm_variant = {
.tclk_mask = (1 << 7) | (1 << 6) | (1 << 5),
};
-void __init samsung_set_timer_source(unsigned int event, unsigned int source)
+void __init s3c64xx_set_timer_source(unsigned int event, unsigned int source)
{
s3c64xx_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
s3c64xx_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
}
-void __init samsung_timer_init(void)
+void __init s3c64xx_timer_init(void)
{
unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {
IRQ_TIMER0_VIC, IRQ_TIMER1_VIC, IRQ_TIMER2_VIC,