[Intel-xe] [PATCH v4 12/12] drm/xe: Prefer single underscore for header guards

[Matt Roper]

On Fri, Feb 24, 2023 at 04:15:48PM -0800, Lucas De Marchi wrote:
> Keep header guards consistent with regard to ifdef used. Prefer the more
> commonly used in the driver.
> 
> 	$ git grep  "ifndef __XE_" -- drivers/gpu/drm/xe | wc -l
> 	8
> 	$ git grep  "ifndef _XE_" -- drivers/gpu/drm/xe | wc -l
> 	112
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/xe/tests/xe_bo_test.h      | 4 ++--
>  drivers/gpu/drm/xe/tests/xe_dma_buf_test.h | 4 ++--
>  drivers/gpu/drm/xe/tests/xe_migrate_test.h | 4 ++--
>  drivers/gpu/drm/xe/tests/xe_test.h         | 4 ++--
>  drivers/gpu/drm/xe/xe_gt_topology.h        | 4 ++--
>  drivers/gpu/drm/xe/xe_map.h                | 4 ++--
>  drivers/gpu/drm/xe/xe_migrate.h            | 4 ++--
>  drivers/gpu/drm/xe/xe_res_cursor.h         | 4 ++--
>  8 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/tests/xe_bo_test.h b/drivers/gpu/drm/xe/tests/xe_bo_test.h
> index d751a618c0c8..0113ab45066a 100644
> --- a/drivers/gpu/drm/xe/tests/xe_bo_test.h
> +++ b/drivers/gpu/drm/xe/tests/xe_bo_test.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2023 Intel Corporation
>   */
>  
> -#ifndef __XE_BO_TEST_H__
> -#define __XE_BO_TEST_H__
> +#ifndef _XE_BO_TEST_H_
> +#define _XE_BO_TEST_H_
>  
>  struct kunit;
>  
> diff --git a/drivers/gpu/drm/xe/tests/xe_dma_buf_test.h b/drivers/gpu/drm/xe/tests/xe_dma_buf_test.h
> index 4e9a8bef5751..e6b464ddd526 100644
> --- a/drivers/gpu/drm/xe/tests/xe_dma_buf_test.h
> +++ b/drivers/gpu/drm/xe/tests/xe_dma_buf_test.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2023 Intel Corporation
>   */
>  
> -#ifndef __XE_DMA_BUF_TEST_H__
> -#define __XE_DMA_BUF_TEST_H__
> +#ifndef _XE_DMA_BUF_TEST_H_
> +#define _XE_DMA_BUF_TEST_H_
>  
>  struct kunit;
>  
> diff --git a/drivers/gpu/drm/xe/tests/xe_migrate_test.h b/drivers/gpu/drm/xe/tests/xe_migrate_test.h
> index db1f8ef035bb..7c645c66824f 100644
> --- a/drivers/gpu/drm/xe/tests/xe_migrate_test.h
> +++ b/drivers/gpu/drm/xe/tests/xe_migrate_test.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2023 Intel Corporation
>   */
>  
> -#ifndef __XE_MIGRATE_TEST_H__
> -#define __XE_MIGRATE_TEST_H__
> +#ifndef _XE_MIGRATE_TEST_H_
> +#define _XE_MIGRATE_TEST_H_
>  
>  struct kunit;
>  
> diff --git a/drivers/gpu/drm/xe/tests/xe_test.h b/drivers/gpu/drm/xe/tests/xe_test.h
> index 1ec502b5acf3..00c8a3f9af81 100644
> --- a/drivers/gpu/drm/xe/tests/xe_test.h
> +++ b/drivers/gpu/drm/xe/tests/xe_test.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2022 Intel Corporation
>   */
>  
> -#ifndef __XE_TEST_H__
> -#define __XE_TEST_H__
> +#ifndef _XE_TEST_H_
> +#define _XE_TEST_H_
>  
>  #include <linux/types.h>
>  
> diff --git a/drivers/gpu/drm/xe/xe_gt_topology.h b/drivers/gpu/drm/xe/xe_gt_topology.h
> index 7a0abc64084f..70a86538f742 100644
> --- a/drivers/gpu/drm/xe/xe_gt_topology.h
> +++ b/drivers/gpu/drm/xe/xe_gt_topology.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2022 Intel Corporation
>   */
>  
> -#ifndef __XE_GT_TOPOLOGY_H__
> -#define __XE_GT_TOPOLOGY_H__
> +#ifndef _XE_GT_TOPOLOGY_H_
> +#define _XE_GT_TOPOLOGY_H_
>  

There's also a matching:

        #endif /* __XE_GT_TOPOLOGY_H__ */

that should have the comment updated.

Aside from that,

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

>  #include "xe_gt_types.h"
>  
> diff --git a/drivers/gpu/drm/xe/xe_map.h b/drivers/gpu/drm/xe/xe_map.h
> index 0bac1f73a80d..032c2e8b5438 100644
> --- a/drivers/gpu/drm/xe/xe_map.h
> +++ b/drivers/gpu/drm/xe/xe_map.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2022 Intel Corporation
>   */
>  
> -#ifndef __XE_MAP_H__
> -#define __XE_MAP_H__
> +#ifndef _XE_MAP_H_
> +#define _XE_MAP_H_
>  
>  #include <linux/iosys-map.h>
>  
> diff --git a/drivers/gpu/drm/xe/xe_migrate.h b/drivers/gpu/drm/xe/xe_migrate.h
> index b2d55283252f..a569851db6f7 100644
> --- a/drivers/gpu/drm/xe/xe_migrate.h
> +++ b/drivers/gpu/drm/xe/xe_migrate.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2020 Intel Corporation
>   */
>  
> -#ifndef __XE_MIGRATE__
> -#define __XE_MIGRATE__
> +#ifndef _XE_MIGRATE_
> +#define _XE_MIGRATE_
>  
>  #include <drm/drm_mm.h>
>  
> diff --git a/drivers/gpu/drm/xe/xe_res_cursor.h b/drivers/gpu/drm/xe/xe_res_cursor.h
> index 365c8ad7aeb8..4e99fae26b4c 100644
> --- a/drivers/gpu/drm/xe/xe_res_cursor.h
> +++ b/drivers/gpu/drm/xe/xe_res_cursor.h
> @@ -21,8 +21,8 @@
>   * OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> -#ifndef __XE_RES_CURSOR_H__
> -#define __XE_RES_CURSOR_H__
> +#ifndef _XE_RES_CURSOR_H_
> +#define _XE_RES_CURSOR_H_
>  
>  #include <linux/scatterlist.h>
>  
> -- 
> 2.39.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation