From patchwork Sat Jul 25 07:46:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Finn Thain X-Patchwork-Id: 499919 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9DD6C14030C for ; Sat, 25 Jul 2015 18:06:51 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 8421A1A2DD6 for ; Sat, 25 Jul 2015 18:06:51 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from kvm5.telegraphics.com.au (kvm5.telegraphics.com.au [98.124.60.144]) by lists.ozlabs.org (Postfix) with ESMTP id E51FF1A0709 for ; Sat, 25 Jul 2015 17:56:51 +1000 (AEST) Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id 82734294E8; Sat, 25 Jul 2015 03:56:48 -0400 (EDT) Message-Id: <20150725074602.693328813@telegraphics.com.au> User-Agent: quilt/0.50-1 Date: Sat, 25 Jul 2015 17:46:12 +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 v5 13/26] powerpc: Cleanup nvram includes References: <20150725074559.543547894@telegraphics.com.au> Content-Disposition: inline; filename=powerpc-fix-nvram-includes X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 --- Changes since v4: - Fix possible git bisect build failure with CONFIG_PPC_PMAC=n. --- arch/powerpc/include/asm/nvram.h | 3 --- arch/powerpc/kernel/setup_32.c | 1 + drivers/char/generic_nvram.c | 1 + drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) Index: linux/arch/powerpc/include/asm/nvram.h =================================================================== --- linux.orig/arch/powerpc/include/asm/nvram.h 2015-07-25 17:42:34.000000000 +1000 +++ linux/arch/powerpc/include/asm/nvram.h 2015-07-25 17:45:38.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-25 17:42:34.000000000 +1000 +++ linux/arch/powerpc/kernel/setup_32.c 2015-07-25 17:45:38.000000000 +1000 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c =================================================================== --- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-25 17:42:34.000000000 +1000 +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-25 17:45:38.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 Index: linux/drivers/char/generic_nvram.c =================================================================== --- linux.orig/drivers/char/generic_nvram.c 2015-07-25 17:42:34.000000000 +1000 +++ linux/drivers/char/generic_nvram.c 2015-07-25 17:45:38.000000000 +1000 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_PPC_PMAC