diff options
author | Markus Armbruster <armbru@redhat.com> | 2016-06-29 13:47:03 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-07-12 16:20:46 +0200 |
commit | 2a6a4076e117113ebec97b1821071afccfdfbc96 (patch) | |
tree | 349b8c30ac34fa345b5ce59aa1f4271dfe1a6543 /hw/net | |
parent | 965379b4555aef0aaae734a7be139454bb0fcac4 (diff) |
Clean up ill-advised or unusual header guards
Cleaned up with scripts/clean-header-guards.pl.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'hw/net')
-rw-r--r-- | hw/net/fsl_etsec/etsec.h | 7 | ||||
-rw-r--r-- | hw/net/fsl_etsec/registers.h | 6 | ||||
-rw-r--r-- | hw/net/rocker/rocker.h | 6 | ||||
-rw-r--r-- | hw/net/rocker/rocker_desc.h | 5 | ||||
-rw-r--r-- | hw/net/rocker/rocker_fp.h | 6 | ||||
-rw-r--r-- | hw/net/rocker/rocker_hw.h | 6 | ||||
-rw-r--r-- | hw/net/rocker/rocker_of_dpa.h | 6 | ||||
-rw-r--r-- | hw/net/rocker/rocker_tlv.h | 4 | ||||
-rw-r--r-- | hw/net/rocker/rocker_world.h | 6 | ||||
-rw-r--r-- | hw/net/vmxnet3.h | 4 | ||||
-rw-r--r-- | hw/net/vmxnet_debug.h | 6 |
11 files changed, 31 insertions, 31 deletions
diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h index e7dc0a4b90..30c828e241 100644 --- a/hw/net/fsl_etsec/etsec.h +++ b/hw/net/fsl_etsec/etsec.h @@ -21,8 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#ifndef _ETSEC_H_ -#define _ETSEC_H_ + +#ifndef ETSEC_H +#define ETSEC_H #include "hw/qdev.h" #include "hw/sysbus.h" @@ -173,4 +174,4 @@ void etsec_write_miim(eTSEC *etsec, void etsec_miim_link_status(eTSEC *etsec, NetClientState *nc); -#endif /* ! _ETSEC_H_ */ +#endif /* ETSEC_H */ diff --git a/hw/net/fsl_etsec/registers.h b/hw/net/fsl_etsec/registers.h index 6fb96842b8..c4ed2b9d62 100644 --- a/hw/net/fsl_etsec/registers.h +++ b/hw/net/fsl_etsec/registers.h @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#ifndef _ETSEC_REGISTERS_H_ -#define _ETSEC_REGISTERS_H_ +#ifndef ETSEC_REGISTERS_H +#define ETSEC_REGISTERS_H enum eTSEC_Register_Access_Type { ACC_RW = 1, /* Read/Write */ @@ -316,4 +316,4 @@ extern const eTSEC_Register_Definition eTSEC_registers_def[]; #define TMR_ETTS2_H (0xEA8 / 4) #define TMR_ETTS2_L (0xEAC / 4) -#endif /* ! _ETSEC_REGISTERS_H_ */ +#endif /* ETSEC_REGISTERS_H */ diff --git a/hw/net/rocker/rocker.h b/hw/net/rocker/rocker.h index f9c80f8013..7ae0495d9e 100644 --- a/hw/net/rocker/rocker.h +++ b/hw/net/rocker/rocker.h @@ -16,8 +16,8 @@ * GNU General Public License for more details. */ -#ifndef _ROCKER_H_ -#define _ROCKER_H_ +#ifndef ROCKER_H +#define ROCKER_H #include "qemu/sockets.h" @@ -81,4 +81,4 @@ int rx_produce(World *world, uint32_t pport, int rocker_port_eg(Rocker *r, uint32_t pport, const struct iovec *iov, int iovcnt); -#endif /* _ROCKER_H_ */ +#endif /* ROCKER_H */ diff --git a/hw/net/rocker/rocker_desc.h b/hw/net/rocker/rocker_desc.h index d4041f5c4c..1dec335614 100644 --- a/hw/net/rocker/rocker_desc.h +++ b/hw/net/rocker/rocker_desc.h @@ -14,9 +14,8 @@ * GNU General Public License for more details. */ - -#ifndef _ROCKER_DESC_H_ -#define _ROCKER_DESC_H_ +#ifndef ROCKER_DESC_H +#define ROCKER_DESC_H #include "rocker_hw.h" diff --git a/hw/net/rocker/rocker_fp.h b/hw/net/rocker/rocker_fp.h index 04592bbfd2..dbe1dd329a 100644 --- a/hw/net/rocker/rocker_fp.h +++ b/hw/net/rocker/rocker_fp.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef _ROCKER_FP_H_ -#define _ROCKER_FP_H_ +#ifndef ROCKER_FP_H +#define ROCKER_FP_H #include "net/net.h" #include "qemu/iov.h" @@ -51,4 +51,4 @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name, void fp_port_free(FpPort *port); void fp_port_reset(FpPort *port); -#endif /* _ROCKER_FP_H_ */ +#endif /* ROCKER_FP_H */ diff --git a/hw/net/rocker/rocker_hw.h b/hw/net/rocker/rocker_hw.h index 8c50830325..1786323fa4 100644 --- a/hw/net/rocker/rocker_hw.h +++ b/hw/net/rocker/rocker_hw.h @@ -6,8 +6,8 @@ * */ -#ifndef _ROCKER_HW_ -#define _ROCKER_HW_ +#ifndef ROCKER_HW_H +#define ROCKER_HW_H #define __le16 uint16_t #define __le32 uint32_t @@ -490,4 +490,4 @@ enum rocker_of_dpa_overlay_type { */ #define ROCKER_CONTROL_RESET (1 << 0) -#endif /* _ROCKER_HW_ */ +#endif /* ROCKER_HW_H */ diff --git a/hw/net/rocker/rocker_of_dpa.h b/hw/net/rocker/rocker_of_dpa.h index f3f6d77807..01c7a97d0d 100644 --- a/hw/net/rocker/rocker_of_dpa.h +++ b/hw/net/rocker/rocker_of_dpa.h @@ -14,9 +14,9 @@ * GNU General Public License for more details. */ -#ifndef _ROCKER_OF_DPA_H_ -#define _ROCKER_OF_DPA_H_ +#ifndef ROCKER_OF_DPA_H +#define ROCKER_OF_DPA_H World *of_dpa_world_alloc(Rocker *r); -#endif /* _ROCKER_OF_DPA_H_ */ +#endif /* ROCKER_OF_DPA_H */ diff --git a/hw/net/rocker/rocker_tlv.h b/hw/net/rocker/rocker_tlv.h index 88561648f0..dd28d08443 100644 --- a/hw/net/rocker/rocker_tlv.h +++ b/hw/net/rocker/rocker_tlv.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef _ROCKER_TLV_H_ -#define _ROCKER_TLV_H_ +#ifndef ROCKER_TLV_H +#define ROCKER_TLV_H #define ROCKER_TLV_ALIGNTO 8U #define ROCKER_TLV_ALIGN(len) \ diff --git a/hw/net/rocker/rocker_world.h b/hw/net/rocker/rocker_world.h index 58ade47335..44f1fe3e19 100644 --- a/hw/net/rocker/rocker_world.h +++ b/hw/net/rocker/rocker_world.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef _ROCKER_WORLD_H_ -#define _ROCKER_WORLD_H_ +#ifndef ROCKER_WORLD_H +#define ROCKER_WORLD_H #include "rocker_hw.h" @@ -58,4 +58,4 @@ const char *world_name(World *world); World *rocker_get_world(Rocker *r, enum rocker_world_type type); -#endif /* _ROCKER_WORLD_H_ */ +#endif /* ROCKER_WORLD_H */ diff --git a/hw/net/vmxnet3.h b/hw/net/vmxnet3.h index f7006afe96..f9352c4a27 100644 --- a/hw/net/vmxnet3.h +++ b/hw/net/vmxnet3.h @@ -15,8 +15,8 @@ * */ -#ifndef _QEMU_VMXNET3_H -#define _QEMU_VMXNET3_H +#ifndef QEMU_VMXNET3_H +#define QEMU_VMXNET3_H #define VMXNET3_DEVICE_MAX_TX_QUEUES 8 #define VMXNET3_DEVICE_MAX_RX_QUEUES 8 /* Keep this value as a power of 2 */ diff --git a/hw/net/vmxnet_debug.h b/hw/net/vmxnet_debug.h index 5aab00b050..cb50aa95db 100644 --- a/hw/net/vmxnet_debug.h +++ b/hw/net/vmxnet_debug.h @@ -15,8 +15,8 @@ * */ -#ifndef _QEMU_VMXNET_DEBUG_H -#define _QEMU_VMXNET_DEBUG_H +#ifndef QEMU_VMXNET_DEBUG_H +#define QEMU_VMXNET_DEBUG_H #define VMXNET_DEVICE_NAME "vmxnet3" @@ -142,4 +142,4 @@ } \ } while (0) -#endif /* _QEMU_VMXNET3_DEBUG_H */ +#endif /* QEMU_VMXNET_DEBUG_H */ |