From: Alessio Belle <[email protected]> - Rename the RISC-V firmware processor header adding an "internal" suffix. - Add guard to the RISC-V firmware processor header to prevent accidental inclusion outside of the RISC-V firmware specific logic.
Signed-off-by: Alessio Belle <[email protected]> Signed-off-by: Alexandru Dadu <[email protected]> --- drivers/gpu/drm/imagination/pvr_fw_riscv.c | 4 +++- .../{pvr_rogue_riscv.h => pvr_rogue_riscv_internal.h} | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/imagination/pvr_fw_riscv.c b/drivers/gpu/drm/imagination/pvr_fw_riscv.c index cd84635bb88d..0d4dd45520a9 100644 --- a/drivers/gpu/drm/imagination/pvr_fw_riscv.c +++ b/drivers/gpu/drm/imagination/pvr_fw_riscv.c @@ -7,7 +7,9 @@ #include "pvr_fw_mips.h" #include "pvr_gem.h" #include "pvr_rogue_cr_defs.h" -#include "pvr_rogue_riscv.h" +#define PVR_ROGUE_RISCV_INTERNAL_H_EXPLICIT_INCLUDE +#include "pvr_rogue_riscv_internal.h" +#undef PVR_ROGUE_RISCV_INTERNAL_H_EXPLICIT_INCLUDE #include "pvr_vm.h" #include <linux/compiler.h> diff --git a/drivers/gpu/drm/imagination/pvr_rogue_riscv.h b/drivers/gpu/drm/imagination/pvr_rogue_riscv_internal.h similarity index 81% rename from drivers/gpu/drm/imagination/pvr_rogue_riscv.h rename to drivers/gpu/drm/imagination/pvr_rogue_riscv_internal.h index d971729e18a4..ba18c2a82205 100644 --- a/drivers/gpu/drm/imagination/pvr_rogue_riscv.h +++ b/drivers/gpu/drm/imagination/pvr_rogue_riscv_internal.h @@ -1,8 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0 OR MIT */ /* Copyright (c) 2024 Imagination Technologies Ltd. */ -#ifndef PVR_ROGUE_RISCV_H -#define PVR_ROGUE_RISCV_H +#ifndef PVR_ROGUE_RISCV_INTERNAL_H +#define PVR_ROGUE_RISCV_INTERNAL_H + +#ifndef PVR_ROGUE_RISCV_INTERNAL_H_EXPLICIT_INCLUDE +#error This file may only be included if explicitly defined +#endif #include "pvr_rogue_cr_defs.h" @@ -36,4 +40,4 @@ enum rogue_riscvfw_region { #define ROGUE_RISCVFW_REGION_BASE(r) ((u32)(ROGUE_RISCV_REGION_##r) << ROGUE_RISCVFW_REGION_SHIFT) -#endif /* PVR_ROGUE_RISCV_H */ +#endif /* PVR_ROGUE_RISCV_INTERNAL_H */ -- 2.43.0
