| Message ID | 20200221052437.2884-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [net-next] net/mlx5: Fix header guard in rsc_dump.h | expand |
On Thu, Feb 20, 2020 at 10:24:37PM -0700, Nathan Chancellor wrote: > Clang warns: > > In file included from > ../drivers/net/ethernet/mellanox/mlx5/core/main.c:73: > ../drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h:4:9: warning: > '__MLX5_RSC_DUMP_H' is used as a header guard here, followed by #define > of a different macro [-Wheader-guard] > #ifndef __MLX5_RSC_DUMP_H > ^~~~~~~~~~~~~~~~~ > ../drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h:5:9: note: > '__MLX5_RSC_DUMP__H' is defined here; did you mean '__MLX5_RSC_DUMP_H'? > #define __MLX5_RSC_DUMP__H > ^~~~~~~~~~~~~~~~~~ > __MLX5_RSC_DUMP_H > 1 warning generated. Wow, that is a neat warning Reviewed-by: Jason Gunthorpe <jgg@mellanox.com> Jason
On Thu, 2020-02-20 at 22:24 -0700, Nathan Chancellor wrote: > Clang warns: > > In file included from > ../drivers/net/ethernet/mellanox/mlx5/core/main.c:73: > ../drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h:4:9: > warning: > '__MLX5_RSC_DUMP_H' is used as a header guard here, followed by > #define > of a different macro [-Wheader-guard] > #ifndef __MLX5_RSC_DUMP_H > ^~~~~~~~~~~~~~~~~ > ../drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h:5:9: > note: > '__MLX5_RSC_DUMP__H' is defined here; did you mean > '__MLX5_RSC_DUMP_H'? > #define __MLX5_RSC_DUMP__H > ^~~~~~~~~~~~~~~~~~ > __MLX5_RSC_DUMP_H > 1 warning generated. > > Make them match to get the intended behavior and remove the warning. Applied to net-next-mlx5 Thanks !
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h b/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h index 3b7573461a45..148270073e71 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h @@ -2,7 +2,7 @@ /* Copyright (c) 2019 Mellanox Technologies. */ #ifndef __MLX5_RSC_DUMP_H -#define __MLX5_RSC_DUMP__H +#define __MLX5_RSC_DUMP_H #include <linux/mlx5/driver.h> #include "mlx5_core.h"
Clang warns: In file included from ../drivers/net/ethernet/mellanox/mlx5/core/main.c:73: ../drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h:4:9: warning: '__MLX5_RSC_DUMP_H' is used as a header guard here, followed by #define of a different macro [-Wheader-guard] #ifndef __MLX5_RSC_DUMP_H ^~~~~~~~~~~~~~~~~ ../drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h:5:9: note: '__MLX5_RSC_DUMP__H' is defined here; did you mean '__MLX5_RSC_DUMP_H'? #define __MLX5_RSC_DUMP__H ^~~~~~~~~~~~~~~~~~ __MLX5_RSC_DUMP_H 1 warning generated. Make them match to get the intended behavior and remove the warning. Fixes: 12206b17235a ("net/mlx5: Add support for resource dump") Link: https://github.com/ClangBuiltLinux/linux/issues/897 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)