From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752928AbbGLKoH (ORCPT ); Sun, 12 Jul 2015 06:44:07 -0400 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:58290 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751712AbbGLKkl (ORCPT ); Sun, 12 Jul 2015 06:40:41 -0400 Message-Id: <20150712102530.535908496@telegraphics.com.au> User-Agent: quilt/0.50-1 Date: Sun, 12 Jul 2015 20:25:40 +1000 From: Finn Thain To: , , , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Arnd Bergmann , Greg Kroah-Hartman , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org Subject: [RFC v4 13/25] powerpc: Cleanup nvram includes References: <20150712102527.356151908@telegraphics.com.au> Content-Disposition: inline; filename=powerpc-fix-nvram-includes Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The nvram_read_byte() and nvram_write_byte() definitions in asm/nvram.h duplicate those in linux/nvram.h. Get rid of the former to prepare for adoption of struct arch_nvram_ops (which is defined in linux/nvram.h for general use). Signed-off-by: Finn Thain --- arch/powerpc/include/asm/nvram.h | 3 --- arch/powerpc/kernel/setup_32.c | 1 + drivers/char/generic_nvram.c | 4 +++- drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) Index: linux/arch/powerpc/include/asm/nvram.h =================================================================== --- linux.orig/arch/powerpc/include/asm/nvram.h 2015-07-12 20:24:53.000000000 +1000 +++ linux/arch/powerpc/include/asm/nvram.h 2015-07-12 20:25:08.000000000 +1000 @@ -101,7 +101,4 @@ extern int nvram_write_os_partition(stru /* Determine NVRAM size */ extern ssize_t nvram_get_size(void); -/* Normal access to NVRAM */ -extern unsigned char nvram_read_byte(int i); -extern void nvram_write_byte(unsigned char c, int i); #endif /* _ASM_POWERPC_NVRAM_H */ Index: linux/arch/powerpc/kernel/setup_32.c =================================================================== --- linux.orig/arch/powerpc/kernel/setup_32.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/arch/powerpc/kernel/setup_32.c 2015-07-12 20:25:08.000000000 +1000 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include Index: linux/drivers/char/generic_nvram.c =================================================================== --- linux.orig/drivers/char/generic_nvram.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/drivers/char/generic_nvram.c 2015-07-12 20:25:08.000000000 +1000 @@ -20,9 +20,11 @@ #include #include #include +#include #include -#include + #ifdef CONFIG_PPC_PMAC +#include #include #endif Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c =================================================================== --- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-12 20:25:08.000000000 +1000 @@ -111,12 +111,12 @@ #include "matroxfb_g450.h" #include #include +#include #include #include #ifdef CONFIG_PPC_PMAC #include -unsigned char nvram_read_byte(int); static int default_vmode = VMODE_NVRAM; static int default_cmode = CMODE_NVRAM; #endif From mboxrd@z Thu Jan 1 00:00:00 1970 From: Finn Thain Subject: [RFC v4 13/25] powerpc: Cleanup nvram includes Date: Sun, 12 Jul 2015 20:25:40 +1000 Message-ID: <20150712102530.535908496@telegraphics.com.au> References: <20150712102527.356151908@telegraphics.com.au> Return-path: Content-Disposition: inline; filename=powerpc-fix-nvram-includes Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, linux-m68k@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Arnd Bergmann , Greg Kroah-Hartman , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org List-Id: linux-m68k@vger.kernel.org The nvram_read_byte() and nvram_write_byte() definitions in asm/nvram.h duplicate those in linux/nvram.h. Get rid of the former to prepare for adoption of struct arch_nvram_ops (which is defined in linux/nvram.h for general use). Signed-off-by: Finn Thain --- arch/powerpc/include/asm/nvram.h | 3 --- arch/powerpc/kernel/setup_32.c | 1 + drivers/char/generic_nvram.c | 4 +++- drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) Index: linux/arch/powerpc/include/asm/nvram.h =================================================================== --- linux.orig/arch/powerpc/include/asm/nvram.h 2015-07-12 20:24:53.000000000 +1000 +++ linux/arch/powerpc/include/asm/nvram.h 2015-07-12 20:25:08.000000000 +1000 @@ -101,7 +101,4 @@ extern int nvram_write_os_partition(stru /* Determine NVRAM size */ extern ssize_t nvram_get_size(void); -/* Normal access to NVRAM */ -extern unsigned char nvram_read_byte(int i); -extern void nvram_write_byte(unsigned char c, int i); #endif /* _ASM_POWERPC_NVRAM_H */ Index: linux/arch/powerpc/kernel/setup_32.c =================================================================== --- linux.orig/arch/powerpc/kernel/setup_32.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/arch/powerpc/kernel/setup_32.c 2015-07-12 20:25:08.000000000 +1000 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include Index: linux/drivers/char/generic_nvram.c =================================================================== --- linux.orig/drivers/char/generic_nvram.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/drivers/char/generic_nvram.c 2015-07-12 20:25:08.000000000 +1000 @@ -20,9 +20,11 @@ #include #include #include +#include #include -#include + #ifdef CONFIG_PPC_PMAC +#include #include #endif Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c =================================================================== --- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-12 20:25:08.000000000 +1000 @@ -111,12 +111,12 @@ #include "matroxfb_g450.h" #include #include +#include #include #include #ifdef CONFIG_PPC_PMAC #include -unsigned char nvram_read_byte(int); static int default_vmode = VMODE_NVRAM; static int default_cmode = CMODE_NVRAM; #endif From mboxrd@z Thu Jan 1 00:00:00 1970 From: Finn Thain Date: Sun, 12 Jul 2015 10:25:40 +0000 Subject: [RFC v4 13/25] powerpc: Cleanup nvram includes Message-Id: <20150712102530.535908496@telegraphics.com.au> List-Id: References: <20150712102527.356151908@telegraphics.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org, linux-m68k@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Arnd Bergmann , Greg Kroah-Hartman , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org The nvram_read_byte() and nvram_write_byte() definitions in asm/nvram.h duplicate those in linux/nvram.h. Get rid of the former to prepare for adoption of struct arch_nvram_ops (which is defined in linux/nvram.h for general use). Signed-off-by: Finn Thain --- arch/powerpc/include/asm/nvram.h | 3 --- arch/powerpc/kernel/setup_32.c | 1 + drivers/char/generic_nvram.c | 4 +++- drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) Index: linux/arch/powerpc/include/asm/nvram.h =================================--- linux.orig/arch/powerpc/include/asm/nvram.h 2015-07-12 20:24:53.000000000 +1000 +++ linux/arch/powerpc/include/asm/nvram.h 2015-07-12 20:25:08.000000000 +1000 @@ -101,7 +101,4 @@ extern int nvram_write_os_partition(stru /* Determine NVRAM size */ extern ssize_t nvram_get_size(void); -/* Normal access to NVRAM */ -extern unsigned char nvram_read_byte(int i); -extern void nvram_write_byte(unsigned char c, int i); #endif /* _ASM_POWERPC_NVRAM_H */ Index: linux/arch/powerpc/kernel/setup_32.c =================================--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/arch/powerpc/kernel/setup_32.c 2015-07-12 20:25:08.000000000 +1000 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include Index: linux/drivers/char/generic_nvram.c =================================--- linux.orig/drivers/char/generic_nvram.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/drivers/char/generic_nvram.c 2015-07-12 20:25:08.000000000 +1000 @@ -20,9 +20,11 @@ #include #include #include +#include #include -#include + #ifdef CONFIG_PPC_PMAC +#include #include #endif Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c =================================--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-12 20:25:08.000000000 +1000 @@ -111,12 +111,12 @@ #include "matroxfb_g450.h" #include #include +#include #include #include #ifdef CONFIG_PPC_PMAC #include -unsigned char nvram_read_byte(int); static int default_vmode = VMODE_NVRAM; static int default_cmode = CMODE_NVRAM; #endif From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from kvm5.telegraphics.com.au (kvm5.telegraphics.com.au [98.124.60.144]) by lists.ozlabs.org (Postfix) with ESMTP id 063081A0D1E for ; Sun, 12 Jul 2015 20:40:40 +1000 (AEST) Message-Id: <20150712102530.535908496@telegraphics.com.au> Date: Sun, 12 Jul 2015 20:25:40 +1000 From: Finn Thain To: , , , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Arnd Bergmann , Greg Kroah-Hartman , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org Subject: [RFC v4 13/25] powerpc: Cleanup nvram includes References: <20150712102527.356151908@telegraphics.com.au> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , The nvram_read_byte() and nvram_write_byte() definitions in asm/nvram.h duplicate those in linux/nvram.h. Get rid of the former to prepare for adoption of struct arch_nvram_ops (which is defined in linux/nvram.h for general use). Signed-off-by: Finn Thain --- arch/powerpc/include/asm/nvram.h | 3 --- arch/powerpc/kernel/setup_32.c | 1 + drivers/char/generic_nvram.c | 4 +++- drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) Index: linux/arch/powerpc/include/asm/nvram.h =================================================================== --- linux.orig/arch/powerpc/include/asm/nvram.h 2015-07-12 20:24:53.000000000 +1000 +++ linux/arch/powerpc/include/asm/nvram.h 2015-07-12 20:25:08.000000000 +1000 @@ -101,7 +101,4 @@ extern int nvram_write_os_partition(stru /* Determine NVRAM size */ extern ssize_t nvram_get_size(void); -/* Normal access to NVRAM */ -extern unsigned char nvram_read_byte(int i); -extern void nvram_write_byte(unsigned char c, int i); #endif /* _ASM_POWERPC_NVRAM_H */ Index: linux/arch/powerpc/kernel/setup_32.c =================================================================== --- linux.orig/arch/powerpc/kernel/setup_32.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/arch/powerpc/kernel/setup_32.c 2015-07-12 20:25:08.000000000 +1000 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include Index: linux/drivers/char/generic_nvram.c =================================================================== --- linux.orig/drivers/char/generic_nvram.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/drivers/char/generic_nvram.c 2015-07-12 20:25:08.000000000 +1000 @@ -20,9 +20,11 @@ #include #include #include +#include #include -#include + #ifdef CONFIG_PPC_PMAC +#include #include #endif Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c =================================================================== --- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-12 20:24:53.000000000 +1000 +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-12 20:25:08.000000000 +1000 @@ -111,12 +111,12 @@ #include "matroxfb_g450.h" #include #include +#include #include #include #ifdef CONFIG_PPC_PMAC #include -unsigned char nvram_read_byte(int); static int default_vmode = VMODE_NVRAM; static int default_cmode = CMODE_NVRAM; #endif