[PATCH 43/85] drivers: gpu: Move prototype declarations to headerfile radeon_asic.h from evergreen.c and ni_dma.c

From: Rashika Kheria
Date: Mon Jan 06 2014 - 10:52:40 EST

Move prototype declarations of function cayman_cp_int_cntl_setup(),
cayman_vm_decode_fault() and cayman_gpu_check_soft_reset() to header
file drm/radeon/radeon_asic.h because they are used by more than one

This eliminates the following warnings in drm/radeon/ni.c:
drivers/gpu/drm/radeon/ni.c:1304:6: warning: no previous prototype for âcayman_cp_int_cntl_setupâ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/ni.c:1599:5: warning: no previous prototype for âcayman_gpu_check_soft_resetâ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/ni.c:2246:6: warning: no previous prototype for âcayman_vm_decode_faultâ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@xxxxxxxxx>
Reviewed-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
drivers/gpu/drm/radeon/evergreen.c | 4 ----
drivers/gpu/drm/radeon/ni_dma.c | 2 --
drivers/gpu/drm/radeon/radeon_asic.h | 5 +++++
3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 9702e55..f4806ed 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -136,10 +136,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev);
void evergreen_fini(struct radeon_device *rdev);
void evergreen_pcie_gen2_enable(struct radeon_device *rdev);
void evergreen_program_aspm(struct radeon_device *rdev);
-extern void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
- int ring, u32 cp_int_cntl);
-extern void cayman_vm_decode_fault(struct radeon_device *rdev,
- u32 status, u32 addr);
void cik_init_cp_pg_table(struct radeon_device *rdev);

extern u32 si_get_csb_size(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c
index bdeb65e..2897cf1 100644
--- a/drivers/gpu/drm/radeon/ni_dma.c
+++ b/drivers/gpu/drm/radeon/ni_dma.c
@@ -27,8 +27,6 @@
#include "radeon_trace.h"
#include "nid.h"

-u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev);
* Starting with R600, the GPU has an asynchronous
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index 5e1f169..732fb6c 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -577,6 +577,11 @@ int evergreen_rlc_resume(struct radeon_device *rdev);
* cayman
+void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
+ int ring, u32 cp_int_cntl);
+void cayman_vm_decode_fault(struct radeon_device *rdev,
+ u32 status, u32 addr);
+u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev);
void cayman_fence_ring_emit(struct radeon_device *rdev,
struct radeon_fence *fence);
void cayman_pcie_gart_tlb_flush(struct radeon_device *rdev);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/