s390x: unify header guards
PATCH 1/1 s390x: unify header guards
Let's unify the header guards to _ASM_S390X_FILE_H_ respectively _S390X_FILE_H_. This makes it more obvious what the file is about, and avoids possible name space collisions.
---
Only did s390x for now; the other archs seem to be inconsistent in places as well, and I can also try to tackle them if it makes sense.
--- lib/s390x/asm/bitops.h | 4 ++-- lib/s390x/asm/cpacf.h | 6 +++--- lib/s390x/asm/interrupt.h | 4 ++-- lib/s390x/asm/io.h | 4 ++-- lib/s390x/asm/mem.h | 4 ++-- lib/s390x/asm/memory_areas.h | 4 ++-- lib/s390x/asm/page.h | 4 ++-- lib/s390x/asm/pgtable.h | 6 +++--- lib/s390x/asm/sigp.h | 6 +++--- lib/s390x/asm/spinlock.h | 4 ++-- lib/s390x/asm/stack.h | 4 ++-- lib/s390x/asm/time.h | 4 ++-- lib/s390x/asm/uv.h | 4 ++-- lib/s390x/css.h | 4 ++-- lib/s390x/interrupt.h | 6 +++--- lib/s390x/mmu.h | 6 +++--- lib/s390x/sclp.h | 6 +++--- lib/s390x/sie.h | 6 +++--- lib/s390x/smp.h | 4 ++-- lib/s390x/uv.h | 6 +++--- lib/s390x/vm.h | 6 +++--- s390x/sthyi.h | 4 ++-- 22 files changed, 53 insertions(+), 53 deletions(-)
lib/s390x/asm/bitops.h +2 -2
@@ -8,8 +8,8 @@* Author(s): Martin Schwidefsky <[email protected]>, * */ -#ifndef _ASMS390X_BITOPS_H_ -#define _ASMS390X_BITOPS_H_ +#ifndef _ASM_S390X_BITOPS_H_ +#define _ASM_S390X_BITOPS_H_#ifndef _BITOPS_H_#error only <bitops.h> can be included directly
lib/s390x/asm/cpacf.h +3 -3
@@ -8,8 +8,8 @@* Harald Freudenberger ([email protected]) * Martin Schwidefsky <[email protected]> */ -#ifndef _ASM_S390_CPACF_H -#define _ASM_S390_CPACF_H +#ifndef _ASM_S390X_CPACF_H_ +#define _ASM_S390X_CPACF_H_#include <asm/facility.h> #include <linux/compiler.h>
@@ -471,4 +471,4 @@ static inline void cpacf_pckmo(long func, void *param) : "cc", "memory"); } -#endif /* _ASM_S390_CPACF_H */ +#endif /* _ASM_S390X_CPACF_H_ */
lib/s390x/asm/interrupt.h +2 -2
@@ -5,8 +5,8 @@* Authors: * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_IRQ_H_ -#define _ASMS390X_IRQ_H_ +#ifndef _ASM_S390X_IRQ_H_ +#define _ASM_S390X_IRQ_H_#include <asm/arch_def.h> #define EXT_IRQ_EMERGENCY_SIG 0x1201
lib/s390x/asm/io.h +2 -2
@@ -6,8 +6,8 @@* Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_IO_H_ -#define _ASMS390X_IO_H_ +#ifndef _ASM_S390X_IO_H_ +#define _ASM_S390X_IO_H_#define __iomem
lib/s390x/asm/mem.h +2 -2
@@ -5,8 +5,8 @@* Copyright IBM Corp. 2018 * Author(s): Janosch Frank <[email protected]> */ -#ifndef _ASM_S390_MEM_H -#define _ASM_S390_MEM_H +#ifndef _ASM_S390X_MEM_H_ +#define _ASM_S390X_MEM_H_#define SKEY_ACC 0xf0#define SKEY_FP 0x08
lib/s390x/asm/memory_areas.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef _ASMS390X_MEMORY_AREAS_H_ -#define _ASMS390X_MEMORY_AREAS_H_ +#ifndef _ASM_S390X_MEMORY_AREAS_H_ +#define _ASM_S390X_MEMORY_AREAS_H_#define AREA_NORMAL_PFN (1 << 19)#define AREA_NORMAL_NUMBER 0
lib/s390x/asm/page.h +2 -2
@@ -6,8 +6,8 @@* Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_PAGE_H_ -#define _ASMS390X_PAGE_H_ +#ifndef _ASM_S390X_PAGE_H_ +#define _ASM_S390X_PAGE_H_#include <asm-generic/page.h>
lib/s390x/asm/pgtable.h +3 -3
@@ -7,8 +7,8 @@* Authors: * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_PGTABLE_H_ -#define _ASMS390X_PGTABLE_H_ +#ifndef _ASM_S390X_PGTABLE_H_ +#define _ASM_S390X_PGTABLE_H_#include <asm/page.h> #include <alloc_page.h>
@@ -219,4 +219,4 @@ static inline void ipte(unsigned long vaddr, pteval_t *p_pte)void configure_dat (int enable); -#endif /* _ASMS390X_PGTABLE_H_ */ +#endif /* _ASM_S390X_PGTABLE_H_ */
lib/s390x/asm/sigp.h +3 -3
@@ -5,8 +5,8 @@* Copied from the Linux kernel file arch/s390/include/asm/sigp.h */ -#ifndef ASM_S390X_SIGP_H -#define ASM_S390X_SIGP_H +#ifndef _ASM_S390X_SIGP_H_ +#define _ASM_S390X_SIGP_H_/* SIGP order codes */ #define SIGP_SENSE 1
@@ -73,4 +73,4 @@ static inline int sigp_retry(uint16_t addr, uint8_t order, unsigned long parm, }#endif /* __ASSEMBLER__ */ -#endif /* ASM_S390X_SIGP_H */ +#endif /* _ASM_S390X_SIGP_H_ */
lib/s390x/asm/spinlock.h +2 -2
@@ -6,8 +6,8 @@* Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> */ -#ifndef __ASMS390X_SPINLOCK_H -#define __ASMS390X_SPINLOCK_H +#ifndef _ASM_S390X_SPINLOCK_H_ +#define _ASM_S390X_SPINLOCK_H_#include <asm-generic/spinlock.h>
lib/s390x/asm/stack.h +2 -2
@@ -6,8 +6,8 @@* Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_STACK_H_ -#define _ASMS390X_STACK_H_ +#ifndef _ASM_S390X_STACK_H_ +#define _ASM_S390X_STACK_H_#ifndef _STACK_H_#error Do not directly include <asm/stack.h>. Just use <stack.h>.
lib/s390x/asm/time.h +2 -2
@@ -8,8 +8,8 @@* Copied from the s390/intercept test by: * Pierre Morel <[email protected]> */ -#ifndef ASM_S390X_TIME_H -#define ASM_S390X_TIME_H +#ifndef _ASM_S390X_TIME_H_ +#define _ASM_S390X_TIME_H_#define STCK_SHIFT_US (63 - 51)#define STCK_MAX ((1UL << 52) - 1)
lib/s390x/asm/uv.h +2 -2
@@ -9,8 +9,8 @@* This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2. */ -#ifndef ASM_S390X_UV_H -#define ASM_S390X_UV_H +#ifndef _ASM_S390X_UV_H_ +#define _ASM_S390X_UV_H_#define UVC_RC_EXECUTED 0x0001#define UVC_RC_INV_CMD 0x0002
lib/s390x/css.h +2 -2
@@ -6,8 +6,8 @@* Author: Pierre Morel <[email protected]> */ -#ifndef CSS_H -#define CSS_H +#ifndef _S390X_CSS_H_ +#define _S390X_CSS_H_#define lowcore_ptr ((struct lowcore *)0x0)
lib/s390x/interrupt.h +3 -3
@@ -1,8 +1,8 @@ -#ifndef INTERRUPT_H -#define INTERRUPT_H +#ifndef _S390X_INTERRUPT_H_ +#define _S390X_INTERRUPT_H_#include <asm/interrupt.h> int register_io_int_func (void (*f)(void ));int unregister_io_int_func (void (*f)(void )); -#endif /* INTERRUPT_H */ +#endif /* _S390X_INTERRUPT_H_ */
lib/s390x/mmu.h +3 -3
@@ -7,12 +7,12 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef _ASMS390X_MMU_H_ -#define _ASMS390X_MMU_H_ +#ifndef _S390X_MMU_H_ +#define _S390X_MMU_H_void protect_page (void *vaddr,unsigned long prot);void protect_range (void *start,unsigned long len,unsigned long prot);void unprotect_page (void *vaddr,unsigned long prot);void unprotect_range (void *start,unsigned long len,unsigned long prot); -#endif /* _ASMS390X_MMU_H_ */ +#endif /* _S390X_MMU_H_ */
lib/s390x/sclp.h +3 -3
@@ -10,8 +10,8 @@* Author: Christian Borntraeger <[email protected]> */ -#ifndef SCLP_H -#define SCLP_H +#ifndef _S390X_SCLP_H_ +#define _S390X_SCLP_H_#define SCLP_CMD_CODE_MASK 0xffff00ff
@@ -329,4 +329,4 @@ void sclp_memory_setup(void);uint64_t get_ram_size (void );uint64_t get_max_ram_size (void ); -#endif /* SCLP_H */ +#endif /* _S390X_SCLP_H_ */
lib/s390x/sie.h +3 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef SIE_H -#define SIE_H +#ifndef _S390X_SIE_H_ +#define _S390X_SIE_H_#define CPUSTAT_STOPPED 0x80000000#define CPUSTAT_WAIT 0x10000000
@@ -195,4 +195,4 @@ extern void sie_entry(void);extern void sie_exit (void );extern void sie64a (struct kvm_s390_sie_block *sblk,struct vm_save_area *save_area); -#endif /* SIE_H */ +#endif /* _S390X_SIE_H_ */
lib/s390x/smp.h +2 -2
@@ -7,8 +7,8 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef SMP_H -#define SMP_H +#ifndef _S390_SMP_H_ +#define _S390_SMP_H_#include <asm/arch_def.h>
lib/s390x/uv.h +3 -3
@@ -1,10 +1,10 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef UV_H -#define UV_H +#ifndef _S390X_UV_H_ +#define _S390X_UV_H_bool uv_os_is_guest (void );bool uv_os_is_host (void );bool uv_query_test_call (unsigned int nr);int uv_setup (void ); -#endif /* UV_H */ +#endif /* _S390X_UV_H_ */
lib/s390x/vm.h +3 -3
@@ -5,9 +5,9 @@* Copyright (c) 2020 Red Hat Inc */ -#ifndef S390X_VM_H -#define S390X_VM_H +#ifndef _S390X_VM_H_ +#define _S390X_VM_H_bool vm_is_tcg (void ); -#endif /* S390X_VM_H */ +#endif /* _S390X_VM_H_ */
s390x/sthyi.h +2 -2
@@ -7,8 +7,8 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef _STHYI_H_ -#define _STHYI_H_ +#ifndef _S390X_STHYI_H_ +#define _S390X_STHYI_H_#include <stdint.h>
Signature · 1 line
2.31.1
Quoted 5 lines · On Tue, 1 Jun 2021 18:15:25 +0200 Cornelia Huck <[email protected]> wrote:
Let's unify the header guards to _ASM_S390X_FILE_H_ respectively _S390X_FILE_H_. This makes it more obvious what the file is about, and avoids possible name space collisions.
Signed-off-by Cornelia Huck <[email protected]>
LGTM, but... what about the other architectures? I think we should try to standardize more generally
Quoted 397 lines
---
Only did s390x for now; the other archs seem to be inconsistent in places as well, and I can also try to tackle them if it makes sense.
--- lib/s390x/asm/bitops.h | 4 ++-- lib/s390x/asm/cpacf.h | 6 +++--- lib/s390x/asm/interrupt.h | 4 ++-- lib/s390x/asm/io.h | 4 ++-- lib/s390x/asm/mem.h | 4 ++-- lib/s390x/asm/memory_areas.h | 4 ++-- lib/s390x/asm/page.h | 4 ++-- lib/s390x/asm/pgtable.h | 6 +++--- lib/s390x/asm/sigp.h | 6 +++--- lib/s390x/asm/spinlock.h | 4 ++-- lib/s390x/asm/stack.h | 4 ++-- lib/s390x/asm/time.h | 4 ++-- lib/s390x/asm/uv.h | 4 ++-- lib/s390x/css.h | 4 ++-- lib/s390x/interrupt.h | 6 +++--- lib/s390x/mmu.h | 6 +++--- lib/s390x/sclp.h | 6 +++--- lib/s390x/sie.h | 6 +++--- lib/s390x/smp.h | 4 ++-- lib/s390x/uv.h | 6 +++--- lib/s390x/vm.h | 6 +++--- s390x/sthyi.h | 4 ++-- 22 files changed, 53 insertions(+), 53 deletions(-)lib/s390x/asm/bitops.h +2
-2@@ -8,8 +8,8 @@* Author(s): Martin Schwidefsky <[email protected]>, * */ -#ifndef _ASMS390X_BITOPS_H_ -#define _ASMS390X_BITOPS_H_ +#ifndef _ASM_S390X_BITOPS_H_ +#define _ASM_S390X_BITOPS_H_#ifndef _BITOPS_H_#error only <bitops.h> can be included directlylib/s390x/asm/cpacf.h +3
-3@@ -8,8 +8,8 @@* Harald Freudenberger ([email protected]) * Martin Schwidefsky <[email protected]> */ -#ifndef _ASM_S390_CPACF_H -#define _ASM_S390_CPACF_H +#ifndef _ASM_S390X_CPACF_H_ +#define _ASM_S390X_CPACF_H_#include <asm/facility.h> #include <linux/compiler.h> @@ -471,4 +471,4 @@ static inline void cpacf_pckmo(long func, void *param) : "cc", "memory"); } -#endif /* _ASM_S390_CPACF_H */ +#endif /* _ASM_S390X_CPACF_H_ */lib/s390x/asm/interrupt.h +2
-2@@ -5,8 +5,8 @@* Authors: * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_IRQ_H_ -#define _ASMS390X_IRQ_H_ +#ifndef _ASM_S390X_IRQ_H_ +#define _ASM_S390X_IRQ_H_#include <asm/arch_def.h> #define EXT_IRQ_EMERGENCY_SIG 0x1201lib/s390x/asm/io.h +2
-2@@ -6,8 +6,8 @@* Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_IO_H_ -#define _ASMS390X_IO_H_ +#ifndef _ASM_S390X_IO_H_ +#define _ASM_S390X_IO_H_#define __iomemlib/s390x/asm/mem.h +2
-2@@ -5,8 +5,8 @@* Copyright IBM Corp. 2018 * Author(s): Janosch Frank <[email protected]> */ -#ifndef _ASM_S390_MEM_H -#define _ASM_S390_MEM_H +#ifndef _ASM_S390X_MEM_H_ +#define _ASM_S390X_MEM_H_#define SKEY_ACC 0xf0#define SKEY_FP 0x08(quoted diff) +0
-0
b/lib/s390x/asm/memory_areas.hindex827bfb356007..c368bbb5dc5e100644lib/s390x/asm/memory_areas.h +2
-2@@ -1,5 +1,5 @@ -#ifndef _ASMS390X_MEMORY_AREAS_H_ -#define _ASMS390X_MEMORY_AREAS_H_ +#ifndef _ASM_S390X_MEMORY_AREAS_H_ +#define _ASM_S390X_MEMORY_AREAS_H_#define AREA_NORMAL_PFN (1 << 19)#define AREA_NORMAL_NUMBER 0lib/s390x/asm/page.h +2
-2@@ -6,8 +6,8 @@* Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_PAGE_H_ -#define _ASMS390X_PAGE_H_ +#ifndef _ASM_S390X_PAGE_H_ +#define _ASM_S390X_PAGE_H_#include <asm-generic/page.h> lib/s390x/asm/pgtable.h +3
-3@@ -7,8 +7,8 @@* Authors: * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_PGTABLE_H_ -#define _ASMS390X_PGTABLE_H_ +#ifndef _ASM_S390X_PGTABLE_H_ +#define _ASM_S390X_PGTABLE_H_#include <asm/page.h> #include <alloc_page.h> @@ -219,4 +219,4 @@ static inline void ipte(unsigned long vaddr, pteval_t *p_pte)void configure_dat (int enable); -#endif /* _ASMS390X_PGTABLE_H_ */ +#endif /* _ASM_S390X_PGTABLE_H_ */ lib/s390x/asm/sigp.h +3
-3@@ -5,8 +5,8 @@* Copied from the Linux kernel file arch/s390/include/asm/sigp.h */ -#ifndef ASM_S390X_SIGP_H -#define ASM_S390X_SIGP_H +#ifndef _ASM_S390X_SIGP_H_ +#define _ASM_S390X_SIGP_H_/* SIGP order codes */ #define SIGP_SENSE 1@@ -73,4 +73,4 @@ static inline int sigp_retry(uint16_t addr, uint8_t order, unsigned long parm, }#endif /* __ASSEMBLER__ */ -#endif /* ASM_S390X_SIGP_H */ +#endif /* _ASM_S390X_SIGP_H_ */ lib/s390x/asm/spinlock.h +2
-2@@ -6,8 +6,8 @@* Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> */ -#ifndef __ASMS390X_SPINLOCK_H -#define __ASMS390X_SPINLOCK_H +#ifndef _ASM_S390X_SPINLOCK_H_ +#define _ASM_S390X_SPINLOCK_H_#include <asm-generic/spinlock.h> lib/s390x/asm/stack.h +2
-2@@ -6,8 +6,8 @@* Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> */ -#ifndef _ASMS390X_STACK_H_ -#define _ASMS390X_STACK_H_ +#ifndef _ASM_S390X_STACK_H_ +#define _ASM_S390X_STACK_H_#ifndef _STACK_H_#error Do not directly include <asm/stack.h>. Just use <stack.h>.lib/s390x/asm/time.h +2
-2@@ -8,8 +8,8 @@* Copied from the s390/intercept test by: * Pierre Morel <[email protected]> */ -#ifndef ASM_S390X_TIME_H -#define ASM_S390X_TIME_H +#ifndef _ASM_S390X_TIME_H_ +#define _ASM_S390X_TIME_H_#define STCK_SHIFT_US (63 - 51)#define STCK_MAX ((1UL << 52) - 1)lib/s390x/asm/uv.h +0
-0@@ -9,8 +9,8 @@* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2. */lib/s390x/asm/uv.h +2
-2-#ifndef ASM_S390X_UV_H -#define ASM_S390X_UV_H +#ifndef _ASM_S390X_UV_H_ +#define _ASM_S390X_UV_H_#define UVC_RC_EXECUTED 0x0001#define UVC_RC_INV_CMD 0x0002lib/s390x/css.h +2
-2@@ -6,8 +6,8 @@* Author: Pierre Morel <[email protected]> */ -#ifndef CSS_H -#define CSS_H +#ifndef _S390X_CSS_H_ +#define _S390X_CSS_H_#define lowcore_ptr ((struct lowcore *)0x0)lib/s390x/interrupt.h +3
-3@@ -1,8 +1,8 @@ -#ifndef INTERRUPT_H -#define INTERRUPT_H +#ifndef _S390X_INTERRUPT_H_ +#define _S390X_INTERRUPT_H_#include <asm/interrupt.h> int register_io_int_func (void (*f)(void ));int unregister_io_int_func (void (*f)(void )); -#endif /* INTERRUPT_H */ +#endif /* _S390X_INTERRUPT_H_ */ lib/s390x/mmu.h +3
-3@@ -7,12 +7,12 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef _ASMS390X_MMU_H_ -#define _ASMS390X_MMU_H_ +#ifndef _S390X_MMU_H_ +#define _S390X_MMU_H_void protect_page (void *vaddr,unsigned long prot);void protect_range (void *start,unsigned long len,unsigned long prot);void unprotect_page (void *vaddr,unsigned long prot);void unprotect_range (void *start,unsigned long len,unsigned long prot); -#endif /* _ASMS390X_MMU_H_ */ +#endif /* _S390X_MMU_H_ */ lib/s390x/sclp.h +3
-3@@ -10,8 +10,8 @@* Author: Christian Borntraeger <[email protected]> */ -#ifndef SCLP_H -#define SCLP_H +#ifndef _S390X_SCLP_H_ +#define _S390X_SCLP_H_#define SCLP_CMD_CODE_MASK 0xffff00ff@@ -329,4 +329,4 @@ void sclp_memory_setup(void);uint64_t get_ram_size (void );uint64_t get_max_ram_size (void ); -#endif /* SCLP_H */ +#endif /* _S390X_SCLP_H_ */ lib/s390x/sie.h +3
-3@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef SIE_H -#define SIE_H +#ifndef _S390X_SIE_H_ +#define _S390X_SIE_H_#define CPUSTAT_STOPPED 0x80000000#define CPUSTAT_WAIT 0x10000000@@ -195,4 +195,4 @@ extern void sie_entry(void);extern void sie_exit (void );extern void sie64a (struct kvm_s390_sie_block *sblk,struct vm_save_area *save_area); -#endif /* SIE_H */ +#endif /* _S390X_SIE_H_ */ lib/s390x/smp.h +2
-2@@ -7,8 +7,8 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef SMP_H -#define SMP_H +#ifndef _S390_SMP_H_ +#define _S390_SMP_H_#include <asm/arch_def.h> lib/s390x/uv.h +3
-3@@ -1,10 +1,10 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef UV_H -#define UV_H +#ifndef _S390X_UV_H_ +#define _S390X_UV_H_bool uv_os_is_guest (void );bool uv_os_is_host (void );bool uv_query_test_call (unsigned int nr);int uv_setup (void ); -#endif /* UV_H */ +#endif /* _S390X_UV_H_ */ lib/s390x/vm.h +3
-3@@ -5,9 +5,9 @@* Copyright (c) 2020 Red Hat Inc */ -#ifndef S390X_VM_H -#define S390X_VM_H +#ifndef _S390X_VM_H_ +#define _S390X_VM_H_bool vm_is_tcg (void ); -#endif /* S390X_VM_H */ +#endif /* _S390X_VM_H_ */ s390x/sthyi.h +2
-2@@ -7,8 +7,8 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef _STHYI_H_ -#define _STHYI_H_ +#ifndef _S390X_STHYI_H_ +#define _S390X_STHYI_H_#include <stdint.h>
Quoted 11 lines · Claudio Imbrenda
Quoted 5 lines · On Tue, 1 Jun 2021 18:15:25 +0200 Cornelia Huck <[email protected]> wrote:
Let's unify the header guards to _ASM_S390X_FILE_H_ respectively _S390X_FILE_H_. This makes it more obvious what the file is about, and avoids possible name space collisions.
Signed-off-by Cornelia Huck <[email protected]>LGTM, but... what about the other architectures? I think we should try to standardize more generally
See my comment below :)
I think it would make sense to standardize all architectures; but I would also like some feedback on the format I have chosen.
Quoted 6 lines
Quoted 6 lines
---
Only did s390x for now; the other archs seem to be inconsistent in places as well, and I can also try to tackle them if it makes sense.
Quoted 9 lines · Cornelia Huck
Let's unify the header guards to _ASM_S390X_FILE_H_ respectively _S390X_FILE_H_. This makes it more obvious what the file is about, and avoids possible name space collisions.
Signed-off-by Cornelia Huck <[email protected]>---
Only did s390x for now; the other archs seem to be inconsistent in places as well, and I can also try to tackle them if it makes sense.
...
lib/s390x/asm/bitops.h line 12
Quoted 12 lines
lib/s390x/asm/bitops.h +2
-2@@ -8,8 +8,8 @@* Author(s): Martin Schwidefsky <[email protected]>, * */ -#ifndef _ASMS390X_BITOPS_H_ -#define _ASMS390X_BITOPS_H_ +#ifndef _ASM_S390X_BITOPS_H_ +#define _ASM_S390X_BITOPS_H_
Why not the other way round (S390X_ASM_BITOPS_H) ?
s390x/sthyi.h line 11
Quoted 12 lines
s390x/sthyi.h +2
-2@@ -7,8 +7,8 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef _STHYI_H_ -#define _STHYI_H_ +#ifndef _S390X_STHYI_H_ +#define _S390X_STHYI_H_
While we're at it: Do we also want to drop the leading (and trailing) underscores here? ... since leading underscore followed by a capital letter is a reserved namespace in C and you should normally not use these in nice programs...? I think I'm ok with keeping the underscores in the files in the lib folder (since these are our core libraries, similar to the system and libc headers on a normal system), but in files that are not part of the lib folder, we should rather avoid them.
Thomas
Quoted 39 lines · Thomas Huth
Quoted 9 lines · Cornelia Huck
Let's unify the header guards to _ASM_S390X_FILE_H_ respectively _S390X_FILE_H_. This makes it more obvious what the file is about, and avoids possible name space collisions.
Signed-off-by Cornelia Huck <[email protected]>---
Only did s390x for now; the other archs seem to be inconsistent in places as well, and I can also try to tackle them if it makes sense.
...
lib/s390x/asm/bitops.h line 12
Quoted 12 lines
lib/s390x/asm/bitops.h +2
-2@@ -8,8 +8,8 @@* Author(s): Martin Schwidefsky <[email protected]>, * */ -#ifndef _ASMS390X_BITOPS_H_ -#define _ASMS390X_BITOPS_H_ +#ifndef _ASM_S390X_BITOPS_H_ +#define _ASM_S390X_BITOPS_H_Why not the other way round (
S390X_ASM_BITOPS_H) ?s390x/sthyi.h line 11
Quoted 12 lines
s390x/sthyi.h +2
-2@@ -7,8 +7,8 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef _STHYI_H_ -#define _STHYI_H_ +#ifndef _S390X_STHYI_H_ +#define _S390X_STHYI_H_
Quoted 7 lines
While we're at it: Do we also want to drop the leading (and trailing) underscores here? ... since leading underscore followed by a capital letter is a reserved namespace in C and you should normally not use these in nice programs...? I think I'm ok with keeping the underscores in the files in the lib folder (since these are our core libraries, similar to the system and libc headers on a normal system), but in files that are not part of the lib folder, we should rather avoid them.
Yes please.
Also, I have the feeling that we should document our decision so we can point people to a file if questions arise.
Quoted 3 lines
Thomas
Quoted 11 lines · Thomas Huth
Quoted 9 lines · Cornelia Huck
Let's unify the header guards to _ASM_S390X_FILE_H_ respectively _S390X_FILE_H_. This makes it more obvious what the file is about, and avoids possible name space collisions.
Signed-off-by Cornelia Huck <[email protected]>---
Only did s390x for now; the other archs seem to be inconsistent in places as well, and I can also try to tackle them if it makes sense.
...
Quoted 14 lines
lib/s390x/asm/bitops.h line 12
Quoted 12 lines
lib/s390x/asm/bitops.h +2
-2@@ -8,8 +8,8 @@* Author(s): Martin Schwidefsky <[email protected]>, * */ -#ifndef _ASMS390X_BITOPS_H_ -#define _ASMS390X_BITOPS_H_ +#ifndef _ASM_S390X_BITOPS_H_ +#define _ASM_S390X_BITOPS_H_Why not the other way round (
S390X_ASM_BITOPS_H) ?
Most existing guards were this way around, I don't really have a preference here, we should just agree on one format :)
Quoted 14 lines
s390x/sthyi.h line 11
Quoted 13 lines
s390x/sthyi.h +2
-2@@ -7,8 +7,8 @@* Authors: * Janosch Frank <[email protected]> */ -#ifndef _STHYI_H_ -#define _STHYI_H_ +#ifndef _S390X_STHYI_H_ +#define _S390X_STHYI_H_
Quoted 7 lines
While we're at it: Do we also want to drop the leading (and trailing) underscores here? ... since leading underscore followed by a capital letter is a reserved namespace in C and you should normally not use these in nice programs...? I think I'm ok with keeping the underscores in the files in the lib folder (since these are our core libraries, similar to the system and libc headers on a normal system), but in files that are not part of the lib folder, we should rather avoid them.
Hm, I actually ended up _adding_ some underscores in various places... I can certainly drop them for !lib.
What about the following structure:
- in lib/<arch>/asm/: _ARCH_ASM_FILE_H_
- in lib/<arch>/: _ARCH_FILE_H_
- in lib/linux/: _LINUX_FILE_H_
- in lib/: _FILE_H_
(lib/libfdt is imported code, leave untouched)
- in <arch>/: ARCH_FILE_H