From 671ca05d7c9766407d7d7e4785d52e4a15d56027 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 21 Feb 2023 15:33:43 -0800 Subject: [PATCH] drm/xe: Make local functions static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A few static functions not being declared like that break the build with W=1, like e.g. cc1: all warnings being treated as errors make[2]: *** [../scripts/Makefile.build:250: drivers/gpu/drm/xe/xe_gt.o] Error 1 ../drivers/gpu/drm/xe/xe_guc.c:240:6: error: no previous prototype for ‘guc_write_params’ [-Werror=missing-prototypes] 240 | void guc_write_params(struct xe_guc *guc) | ^~~~~~~~~~~~~~~~ Make them static. Signed-off-by: Lucas De Marchi Reviewed-by: Matthew Auld Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_gt.c | 6 +++--- drivers/gpu/drm/xe/xe_guc.c | 4 ++-- drivers/gpu/drm/xe/xe_irq.c | 2 +- drivers/gpu/drm/xe/xe_wait_user_fence.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c index c17279653561..809e9b14c314 100644 --- a/drivers/gpu/drm/xe/xe_gt.c +++ b/drivers/gpu/drm/xe/xe_gt.c @@ -218,7 +218,7 @@ static void gt_fini(struct drm_device *drm, void *arg) static void gt_reset_worker(struct work_struct *w); -int emit_nop_job(struct xe_gt *gt, struct xe_engine *e) +static int emit_nop_job(struct xe_gt *gt, struct xe_engine *e) { struct xe_sched_job *job; struct xe_bb *bb; @@ -252,7 +252,7 @@ int emit_nop_job(struct xe_gt *gt, struct xe_engine *e) return 0; } -int emit_wa_job(struct xe_gt *gt, struct xe_engine *e) +static int emit_wa_job(struct xe_gt *gt, struct xe_engine *e) { struct xe_reg_sr *sr = &e->hwe->reg_lrc; struct xe_reg_sr_entry *entry; @@ -609,7 +609,7 @@ int xe_gt_init(struct xe_gt *gt) return 0; } -int do_gt_reset(struct xe_gt *gt) +static int do_gt_reset(struct xe_gt *gt) { struct xe_device *xe = gt_to_xe(gt); int err; diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index 5cdfdfd0de40..32bcc40463e1 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -237,7 +237,7 @@ static void guc_init_params(struct xe_guc *guc) * transfer. These parameters are read by the firmware on startup * and cannot be changed thereafter. */ -void guc_write_params(struct xe_guc *guc) +static void guc_write_params(struct xe_guc *guc) { struct xe_gt *gt = guc_to_gt(guc); int i; @@ -560,7 +560,7 @@ static void guc_handle_mmio_msg(struct xe_guc *guc) "Received early GuC exception notification!\n"); } -void guc_enable_irq(struct xe_guc *guc) +static void guc_enable_irq(struct xe_guc *guc) { struct xe_gt *gt = guc_to_gt(guc); u32 events = xe_gt_is_media_type(gt) ? diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c index a2caa20f2fb3..ab703f1c8b58 100644 --- a/drivers/gpu/drm/xe/xe_irq.c +++ b/drivers/gpu/drm/xe/xe_irq.c @@ -448,7 +448,7 @@ static void dg1_irq_reset(struct xe_gt *gt) GEN3_IRQ_RESET(gt, GEN8_PCU_); } -void xe_irq_reset(struct xe_device *xe) +static void xe_irq_reset(struct xe_device *xe) { struct xe_gt *gt; u8 id; diff --git a/drivers/gpu/drm/xe/xe_wait_user_fence.c b/drivers/gpu/drm/xe/xe_wait_user_fence.c index 8a8d814a0e7a..977c963a8cd0 100644 --- a/drivers/gpu/drm/xe/xe_wait_user_fence.c +++ b/drivers/gpu/drm/xe/xe_wait_user_fence.c @@ -56,9 +56,9 @@ static const enum xe_engine_class user_to_xe_engine_class[] = { [DRM_XE_ENGINE_CLASS_COMPUTE] = XE_ENGINE_CLASS_COMPUTE, }; -int check_hw_engines(struct xe_device *xe, - struct drm_xe_engine_class_instance *eci, - int num_engines) +static int check_hw_engines(struct xe_device *xe, + struct drm_xe_engine_class_instance *eci, + int num_engines) { int i;