From patchwork Wed Jan 18 09:02:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13105914 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 74021C32793 for ; Wed, 18 Jan 2023 09:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=BgPlK/0syxAzkbsYjR7YEXzG5CTE3HCrCGyB3IkLfTA=; b=zbGBY0cYBUjUE6 5FMcQlUbKmycsHvlxIHdwFYAtSwXkMSIK5ina/GMZDGckGnmTQEQUZActybJybnTvt1xaWgp49Ss5 Q4J5oeRAwDgXBSak5hJOPv5KP0fK+urBbtW9QB4WDzmT0kAB4ptINocm6+x0uOuvMLuV+2lsUit5h TNJa+5NwNRr7hG0HLTN6/cmiSghkUbbGvD+Z+marwjc8MUU+++gdC6e58fwRtHpSwHbDA0nQy454g xrJUPi1HVxu0HuJE5rTsxlsfGuw9ymqi0pkaMWupSevCQ6HIoZTt3ZTrX2NaK8lmSnZlp+C1Px3K1 hATaPjP68XaXXQ4x+1lQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI4LC-0000MR-NG; Wed, 18 Jan 2023 09:02:42 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI4L9-0000Lg-2O for linux-arm-kernel@lists.infradead.org; Wed, 18 Jan 2023 09:02:40 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 08DBDCE1B54; Wed, 18 Jan 2023 09:02:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2CD9C433D2; Wed, 18 Jan 2023 09:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674032549; bh=EuAgTB/iPW4vJ/ZRJE/nY3/BVUH2eT5SYitsWMD6MXk=; h=From:To:Cc:Subject:Date:From; b=KjM6elgrcBl+tAIy6K9MSWdfuHOUYGcdsn8MmZRkX8t86g5RRK1AFOIfidSqqG9+c 12E26EhK9+ax/HMr2aFqjgbfSs65XfcbBtagFTZyyoV8K9NV63cTveHFvfXW8p81+Z feeB66PxqeptnbKJX6Cyd7ImBXCXYLS0ZCN92bQbRJ2GpRSwdDLhkOnXd5V02IJkjl qDirtVG2ogDjcOOCq64NNGLzkz0iZHoh3YlQ9vkJiaNzZMxEBaUMnL9MZWt6fM3ND/ mLWnXfrgOVx+V0AWDSiGLLn8F9PEaCGE8xgaNqMKfAbPuPFkEKI76mviiP81NsEmND xOBJ1Nbr8+pUA== From: Arnd Bergmann To: Krzysztof Kozlowski , Daniel Lezcano , Tomasz Figa , Sylwester Nawrocki , Arnd Bergmann Cc: Russell King , Alim Akhtar , Heiko Stuebner , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: s3c: fix s3c64xx_set_timer_source prototype Date: Wed, 18 Jan 2023 10:02:12 +0100 Message-Id: <20230118090224.2162863-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_010239_317792_CF82F463 X-CRM114-Status: GOOD ( 14.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann 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 --- 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));