From patchwork Mon Oct 19 04:57:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Courbot X-Patchwork-Id: 532142 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6B1571402B0 for ; Mon, 19 Oct 2015 15:58:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752648AbbJSE6c (ORCPT ); Mon, 19 Oct 2015 00:58:32 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:11620 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751287AbbJSE62 (ORCPT ); Mon, 19 Oct 2015 00:58:28 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com id ; Sun, 18 Oct 2015 21:58:23 -0700 Received: from hqemhub03.nvidia.com ([172.20.150.15]) by hqnvupgp08.nvidia.com (PGP Universal service); Sun, 18 Oct 2015 21:57:02 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Sun, 18 Oct 2015 21:57:02 -0700 Received: from percival.nvidia.com (172.20.144.16) by hqemhub03.nvidia.com (172.20.150.15) with Microsoft SMTP Server (TLS) id 8.3.342.0; Sun, 18 Oct 2015 21:58:27 -0700 From: Alexandre Courbot To: Tom Warren , Stephen Warren , Thierry Reding CC: , , , Alexandre Courbot Subject: [PATCH 3/4] ARM: tegra: rename GPU functions Date: Mon, 19 Oct 2015 13:57:03 +0900 Message-ID: <1445230624-30314-4-git-send-email-acourbot@nvidia.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445230624-30314-1-git-send-email-acourbot@nvidia.com> References: <1445230624-30314-1-git-send-email-acourbot@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Rename GPU functions to less generic names to avoid potential name collisions. Signed-off-by: Alexandre Courbot Acked-by: Stephen Warren --- arch/arm/include/asm/arch-tegra/gpu.h | 8 ++++---- arch/arm/mach-tegra/board2.c | 4 ++-- arch/arm/mach-tegra/gpu.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/include/asm/arch-tegra/gpu.h index 2fdb2c5049e6..4423386f2805 100644 --- a/arch/arm/include/asm/arch-tegra/gpu.h +++ b/arch/arm/include/asm/arch-tegra/gpu.h @@ -10,11 +10,11 @@ #if defined(CONFIG_TEGRA_GPU) -void config_gpu(void); +void tegra_gpu_config(void); #else /* CONFIG_TEGRA_GPU */ -static inline void config_gpu(void) +static inline void tegra_gpu_config(void) { } @@ -22,11 +22,11 @@ static inline void config_gpu(void) #if defined(CONFIG_OF_LIBFDT) -int gpu_enable_node(void *blob, const char *gpupath); +int tegra_gpu_enable_node(void *blob, const char *gpupath); #else /* CONFIG_OF_LIBFDT */ -static inline int gpu_enable_node(void *blob, const char *gpupath) +static inline int tegra_gpu_enable_node(void *blob, const char *gpupath) { return 0; } diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index ff9e77cfa3a3..8ba143d996ca 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -128,7 +128,7 @@ int board_init(void) clock_init(); clock_verify(); - config_gpu(); + tegra_gpu_config(); #ifdef CONFIG_TEGRA_SPI pin_mux_spi(); @@ -419,7 +419,7 @@ int ft_system_setup(void *blob, bd_t *bd) /* Enable GPU node if GPU setup has been performed */ if (gpu_path != NULL) - return gpu_enable_node(blob, gpu_path); + return tegra_gpu_enable_node(blob, gpu_path); return 0; } diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c index dc29b79e0126..c7d705d8efe9 100644 --- a/arch/arm/mach-tegra/gpu.c +++ b/arch/arm/mach-tegra/gpu.c @@ -25,7 +25,7 @@ static bool _configured; -void config_gpu(void) +void tegra_gpu_config(void) { struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE; @@ -43,7 +43,7 @@ void config_gpu(void) #if defined(CONFIG_OF_LIBFDT) -int gpu_enable_node(void *blob, const char *gpupath) +int tegra_gpu_enable_node(void *blob, const char *gpupath) { int offset;