Commit 81416747 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

target/xtensa: Clean up core-isa.h header guards 



scripts/clean-header-guards.pl warns these headers use reserved
identifier _XTENSA_CORE_CONFIGURATION_H as header guard symbol.  It
additionally warns the guard doesn't match the file name.

Reuse of the same guard symbol in multiple headers is okay as long as
they cannot be included together.

Since we can avoid guard symbol reuse easily, do so: use the guard
symbol scripts/clean-header-guards.pl picks, less the TARGET_ prefix.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190315145123.28030-5-armbru@redhat.com>
parent 43e0c351

target/xtensa/core-de212/core-isa.h

+3 −5
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ 
   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */



#ifndef _XTENSA_CORE_CONFIGURATION_H

#define _XTENSA_CORE_CONFIGURATION_H



#ifndef XTENSA_CORE_DE212_CORE_ISA_H

#define XTENSA_CORE_DE212_CORE_ISA_H



/****************************************************************************

	    Parameters Useful for Any Code, USER or PRIVILEGED
@@ -618,5 +617,4 @@ 
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */





#endif /* _XTENSA_CORE_CONFIGURATION_H */

#endif /* XTENSA_CORE_DE212_CORE_ISA_H */

target/xtensa/core-sample_controller/core-isa.h

+3 −5
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ 
   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */



#ifndef _XTENSA_CORE_CONFIGURATION_H

#define _XTENSA_CORE_CONFIGURATION_H



#ifndef XTENSA_CORE_SAMPLE_CONTROLLER_CORE_ISA_H

#define XTENSA_CORE_SAMPLE_CONTROLLER_CORE_ISA_H



/****************************************************************************

	    Parameters Useful for Any Code, USER or PRIVILEGED
@@ -640,5 +639,4 @@ 
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */





#endif /* _XTENSA_CORE_CONFIGURATION_H */

#endif /* XTENSA_CORE_SAMPLE_CONTROLLER_CORE_ISA_H */

target/xtensa/core-test_kc705_be/core-isa.h

+3 −5
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ 
   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */



#ifndef _XTENSA_CORE_CONFIGURATION_H

#define _XTENSA_CORE_CONFIGURATION_H



#ifndef XTENSA_CORE_TEST_KC705_BE_CORE_ISA_H

#define XTENSA_CORE_TEST_KC705_BE_CORE_ISA_H



/****************************************************************************

	    Parameters Useful for Any Code, USER or PRIVILEGED
@@ -571,5 +570,4 @@ 
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */





#endif /* _XTENSA_CORE_CONFIGURATION_H */

#endif /* XTENSA_CORE_TEST_KC705_BE_CORE_ISA_H */

target/xtensa/core-test_mmuhifi_c3/core-isa.h

+3 −5
Original line number Diff line number Diff line
@@ -7,9 +7,8 @@ 
 * Copyright (c) 1999-2009 Tensilica Inc.

 */



#ifndef _XTENSA_CORE_CONFIGURATION_H

#define _XTENSA_CORE_CONFIGURATION_H



#ifndef XTENSA_CORE_TEST_MMUHIFI_C3_CORE_ISA_H

#define XTENSA_CORE_TEST_MMUHIFI_C3_CORE_ISA_H



/****************************************************************************

	    Parameters Useful for Any Code, USER or PRIVILEGED
@@ -380,5 +379,4 @@ 
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */





#endif /* _XTENSA_CORE_CONFIGURATION_H */

#endif /* XTENSA_CORE_TEST_MMUHIFI_C3_CORE_ISA_H */