From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 005B8215060; Tue, 29 Apr 2025 16:52:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745945566; cv=none; b=PitEd2caCD/f1y+gEZ1VGi3pJNa2MhRmn+PQWhUPX1tIFYclouzZLVvBSyBK5wYFbGasZ1EgYVkJK8eepKveHg/UgmSYtK5N1h3DLkolbj8DbhBlG+QYVPqeYPKN1vdz+FA6/9CqC5hr/5iWpbNZOjkJlR2frlHAuX3EN1bTJd0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745945566; c=relaxed/simple; bh=CbaB9NcDHSEKSA/Xxgmmi3hsvEDeacz0Tb4TB8vEVfk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JeDx1yE3xSjTGNf1pK3L+IL7lcRowbP/yC4xznpRvEY+UrUs7EgeR/u+S6t6mTQQOpxo4fwjzZdrmS+fa+QxvImCeCEADCmOFfxdYdtLUejiAZITB1a52w4avI6QSCHVPPcsdYM+AldTUmj5hbpRM6T+DxQ4KG275pbaheMM9i0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Wb9H6oIk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Wb9H6oIk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84FFAC4CEE3; Tue, 29 Apr 2025 16:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745945565; bh=CbaB9NcDHSEKSA/Xxgmmi3hsvEDeacz0Tb4TB8vEVfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wb9H6oIkhB3aAOFgnftJXg3Pcdq+XYJmocljzxmb5eT3QS4Nexz7v5m39zYvOav8d v43krj9iZkI5dvGh0A1t0GIOdf1neSIB7e6VSTYyzJldBCQzS2VKTVK/g4Tzew2eOZ DIg5PkvEdEhxI3F2Fvv6R9A5aYqFuwbC2Vlc8WPQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, WangYuli , Thomas Bogendoerfer Subject: [PATCH 5.4 126/179] MIPS: ds1287: Match ds1287_set_base_clock() function types Date: Tue, 29 Apr 2025 18:41:07 +0200 Message-ID: <20250429161054.491617650@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161049.383278312@linuxfoundation.org> References: <20250429161049.383278312@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: WangYuli commit a759109b234385b74d2f5f4c86b5f59b3201ec12 upstream. Synchronize the declaration of ds1287_set_base_clock() between cevt-ds1287.c and ds1287.h. Fix follow error with gcc-14 when -Werror: arch/mips/kernel/cevt-ds1287.c:21:5: error: conflicting types for ‘ds1287_set_base_clock’; have ‘int(unsigned int)’ 21 | int ds1287_set_base_clock(unsigned int hz) | ^~~~~~~~~~~~~~~~~~~~~ In file included from arch/mips/kernel/cevt-ds1287.c:13: ./arch/mips/include/asm/ds1287.h:11:13: note: previous declaration of ‘ds1287_set_base_clock’ with type ‘void(unsigned int)’ 11 | extern void ds1287_set_base_clock(unsigned int clock); | ^~~~~~~~~~~~~~~~~~~~~ make[7]: *** [scripts/Makefile.build:207: arch/mips/kernel/cevt-ds1287.o] Error 1 make[6]: *** [scripts/Makefile.build:465: arch/mips/kernel] Error 2 make[6]: *** Waiting for unfinished jobs.... Signed-off-by: WangYuli Signed-off-by: Thomas Bogendoerfer Signed-off-by: Greg Kroah-Hartman --- arch/mips/include/asm/ds1287.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/include/asm/ds1287.h +++ b/arch/mips/include/asm/ds1287.h @@ -8,7 +8,7 @@ #define __ASM_DS1287_H extern int ds1287_timer_state(void); -extern void ds1287_set_base_clock(unsigned int clock); +extern int ds1287_set_base_clock(unsigned int hz); extern int ds1287_clockevent_init(int irq); #endif