From patchwork Mon Jan 6 15:31:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rashika X-Patchwork-Id: 3444371 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C1D0A9F2E9 for ; Tue, 7 Jan 2014 00:50:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 033422016D for ; Tue, 7 Jan 2014 00:50:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1D3402016C for ; Tue, 7 Jan 2014 00:50:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 92BFF1086A0; Mon, 6 Jan 2014 16:50:07 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f47.google.com (mail-pb0-f47.google.com [209.85.160.47]) by gabe.freedesktop.org (Postfix) with ESMTP id AE00C106111 for ; Mon, 6 Jan 2014 07:31:30 -0800 (PST) Received: by mail-pb0-f47.google.com with SMTP id um1so18558225pbc.34 for ; Mon, 06 Jan 2014 07:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=GkIZVKh8rzeY7vfUZtRf++bjUvSZHRvXu3Ym6+gOSq8=; b=XhbYzpBD8voLRYrHk4+QXJ/a3jhJE4diTVyVrAyRtB0OoemM1FS0fXZWno5x2YgEDJ YHJ5nlaO5WMTc8jS3KuG+NU1sVHUJMNFNFDXjnFjUkl187/2zQV9xCewFZ+JYALCTo+f BGGc/h8DfXR0svOCl+edrjmxmxRd0K9BJLyj0rUk5KK48Cxv1+avGcRKZtFCrJcwmG2Z UjA0wv2ZpSLYhSrn3PuTS48zXDOWlYy9FfvsV+YbpVMIofvRJUmNmS4n8CO+8SN97ehr xdPcCvPhPiXVDZi61ljw3lW7LbR3olj0UPkOSSctC68UY89VrPX8M5/g28J5L/N60Pf6 7KFA== X-Received: by 10.68.239.230 with SMTP id vv6mr101023188pbc.34.1389022284196; Mon, 06 Jan 2014 07:31:24 -0800 (PST) Received: from rashika ([14.139.82.6]) by mx.google.com with ESMTPSA id xs1sm169661262pac.7.2014.01.06.07.31.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Jan 2014 07:31:23 -0800 (PST) Date: Mon, 6 Jan 2014 21:01:20 +0530 From: Rashika Kheria To: linux-kernel@vger.kernel.org Subject: [PATCH 30/85] drivers: gpu: Move prototype declarations to appropriate header file radeon.h Message-ID: <578c7cfa386f228b49de13a2de9e64c64ab45e47.1389018325.git.rashika.kheria@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Mailman-Approved-At: Mon, 06 Jan 2014 16:48:58 -0800 Cc: Jerome Glisse , dri-devel@lists.freedesktop.org, josh@joshtriplett.org, Rashika Kheria , Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move prototype declaration to the header file drm/radeon/radeon.h from files drm/radeon/cik.c, drm/radeon/r600_dma.c and drm/radeon/si.c because they are used by more than one file. This eliminates the following warnings in drm/radeon/r600.c: drivers/gpu/drm/radeon/r600.c:1442:5: warning: no previous prototype for ‘r600_gpu_check_soft_reset’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/r600.c:3133:5: warning: no previous prototype for ‘r600_ih_ring_alloc’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/r600.c:3169:6: warning: no previous prototype for ‘r600_ih_ring_fini’ [-Wmissing-prototypes] Signed-off-by: Rashika Kheria Reviewed-by: Josh Triplett --- drivers/gpu/drm/radeon/cik.c | 2 -- drivers/gpu/drm/radeon/r600_dma.c | 2 -- drivers/gpu/drm/radeon/radeon.h | 5 +++++ drivers/gpu/drm/radeon/si.c | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index b43a3a3..fb5943c 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -62,8 +62,6 @@ MODULE_FIRMWARE("radeon/KABINI_mec.bin"); MODULE_FIRMWARE("radeon/KABINI_rlc.bin"); MODULE_FIRMWARE("radeon/KABINI_sdma.bin"); -extern int r600_ih_ring_alloc(struct radeon_device *rdev); -extern void r600_ih_ring_fini(struct radeon_device *rdev); extern void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save); extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save); extern bool evergreen_is_display_hung(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c index 7844d15..3e4b6d2 100644 --- a/drivers/gpu/drm/radeon/r600_dma.c +++ b/drivers/gpu/drm/radeon/r600_dma.c @@ -26,8 +26,6 @@ #include "radeon_asic.h" #include "r600d.h" -u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); - /* * DMA * Starting with R600, the GPU has an asynchronous diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index e874392..28414f2 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -100,6 +100,11 @@ extern int radeon_dpm; extern int radeon_aspm; extern int radeon_runtime_pm; +u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); + +void r600_ih_ring_fini(struct radeon_device *rdev); +int r600_ih_ring_alloc(struct radeon_device *rdev); + /* * Copy from radeon_drv.h so we don't have to include both and have conflicting * symbol; diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index a36736d..762c5f6 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -70,8 +70,6 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev); static void si_program_aspm(struct radeon_device *rdev); extern void sumo_rlc_fini(struct radeon_device *rdev); extern int sumo_rlc_init(struct radeon_device *rdev); -extern int r600_ih_ring_alloc(struct radeon_device *rdev); -extern void r600_ih_ring_fini(struct radeon_device *rdev); extern void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev); extern void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save); extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save);