From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 419vL56mhkzF0vb for ; Thu, 21 Jun 2018 05:00:45 +1000 (AEST) Received: by mail-wm0-x241.google.com with SMTP id r15-v6so1202744wmc.1 for ; Wed, 20 Jun 2018 12:00:45 -0700 (PDT) Sender: Mathieu Malaterre From: Mathieu Malaterre To: Michael Ellerman Cc: Mathieu Malaterre , Benjamin Herrenschmidt , Paul Mackerras , Nicholas Piggin , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] powerpc/32: Remove left over function prototypes Date: Wed, 20 Jun 2018 21:00:37 +0200 Message-Id: <20180620190038.3250-1-malat@debian.org> In-Reply-To: <20180408194821.19682-1-malat@debian.org> References: <20180408194821.19682-1-malat@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , In commit 4aea909eeba3 ("powerpc: Add missing prototypes in setup_32.c") prototypes for - ppc_setup_l2cr - ppc_setup_l3cr - ppc_init were added but at the same time in commit d15a261d876d ("powerpc/32: Make some functions static") those same functions were made static. Fix conflicting changes by removing the prototypes and leave the function as static. Fix the following warnings, treated as errors with W=1: arch/powerpc/kernel/setup_32.c:127:19: error: static declaration of ‘ppc_setup_l2cr’ follows non-static declaration arch/powerpc/kernel/setup_32.c:140:19: error: static declaration of ‘ppc_setup_l3cr’ follows non-static declaration arch/powerpc/kernel/setup_32.c:186:19: error: static declaration of ‘ppc_init’ follows non-static declaration Signed-off-by: Mathieu Malaterre --- v3: correct subject line to be less confusing v2: Previous version contained the reverted patch, correct that. arch/powerpc/kernel/setup.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h index 35ca309848d7..829ed66f0a40 100644 --- a/arch/powerpc/kernel/setup.h +++ b/arch/powerpc/kernel/setup.h @@ -19,9 +19,6 @@ void irqstack_early_init(void); void setup_power_save(void); unsigned long __init early_init(unsigned long dt_ptr); void __init machine_init(u64 dt_ptr); -int __init ppc_setup_l2cr(char *str); -int __init ppc_setup_l3cr(char *str); -int __init ppc_init(void); #else static inline void setup_power_save(void) { }; #endif -- 2.11.0