Change in coreboot[master]: soc/amd/common/block: drop double underscores from include guards
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47583 )
Change subject: soc/amd/common/block: drop double underscores from include guards ......................................................................
soc/amd/common/block: drop double underscores from include guards
Since coreboot is written in C and not C++, having the double underscores as a prefix is not an issue, but it also doesn't add much information, so drop them and the trailing ones as well.
Change-Id: I1028fb9097efab8ffae5ffa9fe85a97feebc78a9 Signed-off-by: Felix Held felix-coreboot@felixheld.de --- M src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h M src/soc/amd/common/block/include/amdblocks/acpi.h M src/soc/amd/common/block/include/amdblocks/acpimmio.h M src/soc/amd/common/block/include/amdblocks/acpimmio_map.h M src/soc/amd/common/block/include/amdblocks/agesawrapper.h M src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h M src/soc/amd/common/block/include/amdblocks/alink.h M src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h M src/soc/amd/common/block/include/amdblocks/amd_pci_util.h M src/soc/amd/common/block/include/amdblocks/biosram.h M src/soc/amd/common/block/include/amdblocks/car.h M src/soc/amd/common/block/include/amdblocks/chip.h M src/soc/amd/common/block/include/amdblocks/dimm_spd.h M src/soc/amd/common/block/include/amdblocks/espi.h M src/soc/amd/common/block/include/amdblocks/gpio_banks.h M src/soc/amd/common/block/include/amdblocks/hda.h M src/soc/amd/common/block/include/amdblocks/image.h M src/soc/amd/common/block/include/amdblocks/lpc.h M src/soc/amd/common/block/include/amdblocks/pci_devs.h M src/soc/amd/common/block/include/amdblocks/psp.h M src/soc/amd/common/block/include/amdblocks/reset.h M src/soc/amd/common/block/include/amdblocks/s3_resume.h M src/soc/amd/common/block/include/amdblocks/sata.h M src/soc/amd/common/block/include/amdblocks/smu.h M src/soc/amd/common/block/include/amdblocks/spi.h 25 files changed, 75 insertions(+), 75 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/47583/1
diff --git a/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h index 5422323..e7d3260 100644 --- a/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h +++ b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_CALLOUTS_AGESA_H__ -#define __AMD_BLOCK_CALLOUTS_AGESA_H__ +#ifndef AMD_BLOCK_CALLOUTS_AGESA_H +#define AMD_BLOCK_CALLOUTS_AGESA_H
#include <amdblocks/agesawrapper.h> #include <stdint.h> @@ -69,4 +69,4 @@ extern const BIOS_CALLOUT_STRUCT BiosCallouts[]; extern const int BiosCalloutsLen;
-#endif /* __AMD_BLOCK_CALLOUTS_AGESA_H__ */ +#endif /* AMD_BLOCK_CALLOUTS_AGESA_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index 7a9206d..c6e242a 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_ACPI_H__ -#define __AMD_BLOCK_ACPI_H__ +#ifndef AMD_BLOCK_ACPI_H +#define AMD_BLOCK_ACPI_H
#include <types.h> #include <soc/nvs.h> @@ -44,4 +44,4 @@ void acpi_enable_sci(void); void acpi_disable_sci(void);
-#endif /* __AMD_BLOCK_ACPI_H__ */ +#endif /* AMD_BLOCK_ACPI_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio.h b/src/soc/amd/common/block/include/amdblocks/acpimmio.h index 6d96fcd..932ae47 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef __AMD_BLOCK_ACPIMMIO_H__ -#define __AMD_BLOCK_ACPIMMIO_H__ +#ifndef AMD_BLOCK_ACPIMMIO_H +#define AMD_BLOCK_ACPIMMIO_H
#include <device/mmio.h> #include <types.h> @@ -508,4 +508,4 @@ write8(acpimmio_aoac + reg, value); }
-#endif /* __AMD_BLOCK_ACPIMMIO_H__ */ +#endif /* AMD_BLOCK_ACPIMMIO_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h b/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h index 0e80ff4..abf014c 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef __AMD_BLOCK_ACPIMMIO_MAP_H__ -#define __AMD_BLOCK_ACPIMMIO_MAP_H__ +#ifndef AMD_BLOCK_ACPIMMIO_MAP_H +#define AMD_BLOCK_ACPIMMIO_MAP_H
/* * The following AcpiMmio register block mapping represents definitions @@ -132,4 +132,4 @@
#endif
-#endif /* __AMD_BLOCK_ACPIMMIO_MAP_H__ */ +#endif /* AMD_BLOCK_ACPIMMIO_MAP_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h index 85505d1c..8c08ba0 100644 --- a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h +++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_AGESAWRAPPER_H__ -#define __AMD_BLOCK_AGESAWRAPPER_H__ +#ifndef AMD_BLOCK_AGESAWRAPPER_H +#define AMD_BLOCK_AGESAWRAPPER_H
#include <agesa_headers.h>
@@ -39,4 +39,4 @@ void set_board_env_params(GNB_ENV_CONFIGURATION *params); void soc_customize_init_early(AMD_EARLY_PARAMS *InitEarly);
-#endif /* __AMD_BLOCK_AGESAWRAPPER_H__ */ +#endif /* AMD_BLOCK_AGESAWRAPPER_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h index 7174f5e..45bb987 100644 --- a/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h +++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_AGESAWRAPPER_CALL_H__ -#define __AMD_BLOCK_AGESAWRAPPER_CALL_H__ +#ifndef AMD_BLOCK_AGESAWRAPPER_CALL_H +#define AMD_BLOCK_AGESAWRAPPER_CALL_H
#include <amdblocks/agesawrapper.h> #include <stdint.h> @@ -41,4 +41,4 @@ return (u32)ret; }
-#endif /* __AMD_BLOCK_AGESAWRAPPER_CALL_H__ */ +#endif /* AMD_BLOCK_AGESAWRAPPER_CALL_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/alink.h b/src/soc/amd/common/block/include/amdblocks/alink.h index be1917c..73373bd 100644 --- a/src/soc/amd/common/block/include/amdblocks/alink.h +++ b/src/soc/amd/common/block/include/amdblocks/alink.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_ALINK_H__ -#define __AMD_BLOCK_ALINK_H__ +#ifndef AMD_BLOCK_ALINK_H +#define AMD_BLOCK_ALINK_H
#include <stdint.h>
@@ -32,4 +32,4 @@ void alink_ab_indx(u32 reg_space, u32 reg_addr, u32 mask, u32 val); void alink_ax_indx(u32 space /* c or p? */, u32 axindc, u32 mask, u32 val);
-#endif /* __AMD_BLOCK_ALINK_H__ */ +#endif /* AMD_BLOCK_ALINK_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h b/src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h index 067ff98..bcac45a 100644 --- a/src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h +++ b/src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_PCI_MMCONF_H__ -#define __AMD_BLOCK_PCI_MMCONF_H__ +#ifndef AMD_BLOCK_PCI_MMCONF_H +#define AMD_BLOCK_PCI_MMCONF_H
void enable_pci_mmconf(void);
-#endif /* __AMD_BLOCK_PCI_MMCONF_H__ */ +#endif /* AMD_BLOCK_PCI_MMCONF_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h index a37c1fd..46fcfbf 100644 --- a/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h +++ b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_PCI_UTIL_H__ -#define __AMD_BLOCK_PCI_UTIL_H__ +#ifndef AMD_BLOCK_PCI_UTIL_H +#define AMD_BLOCK_PCI_UTIL_H
#include <stdint.h> #include <soc/amd_pci_int_defs.h> @@ -31,4 +31,4 @@ void write_pci_int_table(void); const struct irq_idx_name *sb_get_apic_reg_association(size_t *size);
-#endif /* __AMD_BLOCK_PCI_UTIL_H__ */ +#endif /* AMD_BLOCK_PCI_UTIL_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/biosram.h b/src/soc/amd/common/block/include/amdblocks/biosram.h index a7a73e0..934a244 100644 --- a/src/soc/amd/common/block/include/amdblocks/biosram.h +++ b/src/soc/amd/common/block/include/amdblocks/biosram.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_BIOSRAM_H__ -#define __AMD_BLOCK_BIOSRAM_H__ +#ifndef AMD_BLOCK_BIOSRAM_H +#define AMD_BLOCK_BIOSRAM_H
#include <stdint.h>
@@ -26,4 +26,4 @@ /* Returns the saved UMA base */ uint64_t get_uma_base(void);
-#endif /* __AMD_BLOCK_BIOSRAM_H__ */ +#endif /* AMD_BLOCK_BIOSRAM_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/car.h b/src/soc/amd/common/block/include/amdblocks/car.h index 055f294..2f58924 100644 --- a/src/soc/amd/common/block/include/amdblocks/car.h +++ b/src/soc/amd/common/block/include/amdblocks/car.h @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_CAR_H__ -#define __AMD_BLOCK_CAR_H__ +#ifndef AMD_BLOCK_CAR_H +#define AMD_BLOCK_CAR_H
#include <stdint.h>
void ap_teardown_car(uint32_t flags);
-#endif /* __AMD_BLOCK_CAR_H__ */ +#endif /* AMD_BLOCK_CAR_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/chip.h b/src/soc/amd/common/block/include/amdblocks/chip.h index 8794421..c1820e2 100644 --- a/src/soc/amd/common/block/include/amdblocks/chip.h +++ b/src/soc/amd/common/block/include/amdblocks/chip.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_CHIP_H__ -#define __AMD_BLOCK_CHIP_H__ +#ifndef AMD_BLOCK_CHIP_H +#define AMD_BLOCK_CHIP_H
#include <amdblocks/espi.h> #include <amdblocks/spi.h> @@ -28,4 +28,4 @@ */ const struct soc_amd_common_config *soc_get_common_config(void);
-#endif /* __AMD_BLOCK_CHIP_H__ */ +#endif /* AMD_BLOCK_CHIP_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/dimm_spd.h b/src/soc/amd/common/block/include/amdblocks/dimm_spd.h index 5bfb494..d5eb617 100644 --- a/src/soc/amd/common/block/include/amdblocks/dimm_spd.h +++ b/src/soc/amd/common/block/include/amdblocks/dimm_spd.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_DIMM_SPD_H__ -#define __AMD_BLOCK_DIMM_SPD_H__ +#ifndef AMD_BLOCK_DIMM_SPD_H +#define AMD_BLOCK_DIMM_SPD_H
#include <amdblocks/agesawrapper.h> #include <stddef.h> @@ -15,4 +15,4 @@ int mainboard_read_spd(uint8_t spdAddress, char *buf, size_t len); int sb_read_spd(uint8_t spdAddress, char *buf, size_t len);
-#endif /* __AMD_BLOCK_DIMM_SPD_H__ */ +#endif /* AMD_BLOCK_DIMM_SPD_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/espi.h b/src/soc/amd/common/block/include/amdblocks/espi.h index c2d822e..c593e02 100644 --- a/src/soc/amd/common/block/include/amdblocks/espi.h +++ b/src/soc/amd/common/block/include/amdblocks/espi.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_ESPI_H__ -#define __AMD_BLOCK_ESPI_H__ +#ifndef AMD_BLOCK_ESPI_H +#define AMD_BLOCK_ESPI_H
#include <stdint.h> #include <stddef.h> @@ -118,4 +118,4 @@ */ int espi_setup(void);
-#endif /* __AMD_BLOCK_ESPI_H__ */ +#endif /* AMD_BLOCK_ESPI_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h index 4b2bfdd..b6162d7 100644 --- a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h +++ b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_GPIO_BANKS_H__ -#define __AMD_BLOCK_GPIO_BANKS_H__ +#ifndef AMD_BLOCK_GPIO_BANKS_H +#define AMD_BLOCK_GPIO_BANKS_H
#include <types.h>
@@ -361,4 +361,4 @@ /* May be implemented by soc to handle special cases */ void soc_gpio_hook(uint8_t gpio, uint8_t mux);
-#endif /* __AMD_BLOCK_GPIO_BANKS_H__ */ +#endif /* AMD_BLOCK_GPIO_BANKS_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/hda.h b/src/soc/amd/common/block/include/amdblocks/hda.h index 55feb6b..a7a0b84 100644 --- a/src/soc/amd/common/block/include/amdblocks/hda.h +++ b/src/soc/amd/common/block/include/amdblocks/hda.h @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_HDA_H__ -#define __AMD_BLOCK_HDA_H__ +#ifndef AMD_BLOCK_HDA_H +#define AMD_BLOCK_HDA_H
#include <device/device.h>
/* SoC callback to add any quirks to HDA device node in SSDT. */ void hda_soc_ssdt_quirks(const struct device *dev);
-#endif /* __AMD_BLOCK_HDA_H__ */ +#endif /* AMD_BLOCK_HDA_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/image.h b/src/soc/amd/common/block/include/amdblocks/image.h index 92d4002..27c8991 100644 --- a/src/soc/amd/common/block/include/amdblocks/image.h +++ b/src/soc/amd/common/block/include/amdblocks/image.h @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_IMAGE_H__ -#define __AMD_BLOCK_IMAGE_H__ +#ifndef AMD_BLOCK_IMAGE_H +#define AMD_BLOCK_IMAGE_H
#include <stdint.h>
void *amd_find_image(const void *start_address, const void *end_address, uint32_t alignment, const char name[8]);
-#endif /* __AMD_BLOCK_IMAGE_H__ */ +#endif /* AMD_BLOCK_IMAGE_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/lpc.h b/src/soc/amd/common/block/include/amdblocks/lpc.h index 1b69a5b3..fbedb71 100644 --- a/src/soc/amd/common/block/include/amdblocks/lpc.h +++ b/src/soc/amd/common/block/include/amdblocks/lpc.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_LPC_H__ -#define __AMD_BLOCK_LPC_H__ +#ifndef AMD_BLOCK_LPC_H +#define AMD_BLOCK_LPC_H
#include <types.h>
@@ -198,4 +198,4 @@ /* Enable SPI ROM (SPI_ROM_ENABLE, SPI_ROM_ALT_ENABLE) */ void lpc_enable_spi_rom(uint32_t enable);
-#endif /* __AMD_BLOCK_LPC_H__ */ +#endif /* AMD_BLOCK_LPC_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/pci_devs.h b/src/soc/amd/common/block/include/amdblocks/pci_devs.h index 8a38ac1..074bdd8 100644 --- a/src/soc/amd/common/block/include/amdblocks/pci_devs.h +++ b/src/soc/amd/common/block/include/amdblocks/pci_devs.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_PCI_DEVS_H__ -#define __AMD_BLOCK_PCI_DEVS_H__ +#ifndef AMD_BLOCK_PCI_DEVS_H +#define AMD_BLOCK_PCI_DEVS_H
#include <device/pci_def.h>
@@ -12,4 +12,4 @@ #define _SOC_DEV(slot, func) PCI_DEV(0, slot, func) #endif
-#endif /* __AMD_BLOCK_PCI_DEVS_H__ */ +#endif /* AMD_BLOCK_PCI_DEVS_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h index f509a5a..8cd8236 100644 --- a/src/soc/amd/common/block/include/amdblocks/psp.h +++ b/src/soc/amd/common/block/include/amdblocks/psp.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_PSP_H__ -#define __AMD_BLOCK_PSP_H__ +#ifndef AMD_BLOCK_PSP_H +#define AMD_BLOCK_PSP_H
/* Get the mailbox base address - specific to family of device. */ void *soc_get_mbox_address(void); @@ -74,4 +74,4 @@
int psp_load_named_blob(enum psp_blob_type type, const char *name);
-#endif /* __AMD_BLOCK_PSP_H__ */ +#endif /* AMD_BLOCK_PSP_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/reset.h b/src/soc/amd/common/block/include/amdblocks/reset.h index 7912bd2..b825f47 100644 --- a/src/soc/amd/common/block/include/amdblocks/reset.h +++ b/src/soc/amd/common/block/include/amdblocks/reset.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_RESET_H__ -#define __AMD_BLOCK_RESET_H__ +#ifndef AMD_BLOCK_RESET_H +#define AMD_BLOCK_RESET_H
#include <console/console.h> #include <arch/cache.h> @@ -26,4 +26,4 @@ halt(); }
-#endif /* __AMD_BLOCK_RESET_H__ */ +#endif /* AMD_BLOCK_RESET_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/s3_resume.h b/src/soc/amd/common/block/include/amdblocks/s3_resume.h index 6931a5f..f7fce00 100644 --- a/src/soc/amd/common/block/include/amdblocks/s3_resume.h +++ b/src/soc/amd/common/block/include/amdblocks/s3_resume.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_S3_RESUME_H__ -#define __AMD_BLOCK_S3_RESUME_H__ +#ifndef AMD_BLOCK_S3_RESUME_H +#define AMD_BLOCK_S3_RESUME_H
#include <agesa_headers.h>
@@ -9,4 +9,4 @@ AGESA_STATUS OemS3LateRestore(S3_DATA_BLOCK *dataBlock); AGESA_STATUS OemS3Save(S3_DATA_BLOCK *dataBlock);
-#endif /* __AMD_BLOCK_S3_RESUME_H__ */ +#endif /* AMD_BLOCK_S3_RESUME_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/sata.h b/src/soc/amd/common/block/include/amdblocks/sata.h index 945b9cd..03e1577 100644 --- a/src/soc/amd/common/block/include/amdblocks/sata.h +++ b/src/soc/amd/common/block/include/amdblocks/sata.h @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_SATA_H__ -#define __AMD_BLOCK_SATA_H__ +#ifndef AMD_BLOCK_SATA_H +#define AMD_BLOCK_SATA_H
#include <device/device.h>
void soc_enable_sata_features(struct device *dev);
-#endif /* __AMD_BLOCK_SATA_H__ */ +#endif /* AMD_BLOCK_SATA_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/smu.h b/src/soc/amd/common/block/include/amdblocks/smu.h index 57ef3b3..ca5e37a 100644 --- a/src/soc/amd/common/block/include/amdblocks/smu.h +++ b/src/soc/amd/common/block/include/amdblocks/smu.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_SMU_H__ -#define __AMD_BLOCK_SMU_H__ +#ifndef AMD_BLOCK_SMU_H +#define AMD_BLOCK_SMU_H
#include <types.h> #include <soc/smu.h> /* SoC-dependent definitions for SMU access */ @@ -23,4 +23,4 @@ */ enum cb_err send_smu_message(enum smu_message_id message_id, struct smu_payload *arg);
-#endif /* __AMD_BLOCK_SMU_H__ */ +#endif /* AMD_BLOCK_SMU_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/spi.h b/src/soc/amd/common/block/include/amdblocks/spi.h index 18940a3..7da1b24 100644 --- a/src/soc/amd/common/block/include/amdblocks/spi.h +++ b/src/soc/amd/common/block/include/amdblocks/spi.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_SPI_H__ -#define __AMD_BLOCK_SPI_H__ +#ifndef AMD_BLOCK_SPI_H +#define AMD_BLOCK_SPI_H
#include <types.h>
@@ -108,4 +108,4 @@ void spi_write16(uint8_t reg, uint16_t val); void spi_write32(uint8_t reg, uint32_t val);
-#endif /* __AMD_BLOCK_SPI_H__ */ +#endif /* AMD_BLOCK_SPI_H */
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47583 )
Change subject: soc/amd/common/block: drop double underscores from include guards ......................................................................
Patch Set 1: Code-Review+1
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47583 )
Change subject: soc/amd/common/block: drop double underscores from include guards ......................................................................
Patch Set 1:
See CB:21073, I have no access to BUG=b:62235990 commentary.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47583 )
Change subject: soc/amd/common/block: drop double underscores from include guards ......................................................................
Patch Set 1:
Patch Set 1:
See CB:21073, I have no access to BUG=b:62235990 commentary.
I don't have access to the bug either, but I don't expect much more info in there. Before the patch you referenced some of the include guards had one leading underscore, which they shouldn't have. I've added the people involved in that patch, so they have a chance to comment on this one and the related ones in the patch train.
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47583 )
Change subject: soc/amd/common/block: drop double underscores from include guards ......................................................................
Patch Set 1:
Patch Set 1:
Patch Set 1:
See CB:21073, I have no access to BUG=b:62235990 commentary.
I don't have access to the bug either, but I don't expect much more info in there. Before the patch you referenced some of the include guards had one leading underscore, which they shouldn't have. I've added the people involved in that patch, so they have a chance to comment on this one and the related ones in the patch train.
The bug looks like simply a todo to address the comment in https://review.coreboot.org/c/coreboot/+/19722/3/src/soc/amd/stoneyridge/inc.... The double underscores were deliberate, although I can't recall who decided that and if there was a compelling reason.
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47583 )
Change subject: soc/amd/common/block: drop double underscores from include guards ......................................................................
Patch Set 2: Code-Review+2
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47583 )
Change subject: soc/amd/common/block: drop double underscores from include guards ......................................................................
soc/amd/common/block: drop double underscores from include guards
Since coreboot is written in C and not C++, having the double underscores as a prefix is not an issue, but it also doesn't add much information, so drop them and the trailing ones as well.
Change-Id: I1028fb9097efab8ffae5ffa9fe85a97feebc78a9 Signed-off-by: Felix Held felix-coreboot@felixheld.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/47583 Reviewed-by: Martin Roth martinroth@google.com Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h M src/soc/amd/common/block/include/amdblocks/acpi.h M src/soc/amd/common/block/include/amdblocks/acpimmio.h M src/soc/amd/common/block/include/amdblocks/acpimmio_map.h M src/soc/amd/common/block/include/amdblocks/agesawrapper.h M src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h M src/soc/amd/common/block/include/amdblocks/alink.h M src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h M src/soc/amd/common/block/include/amdblocks/amd_pci_util.h M src/soc/amd/common/block/include/amdblocks/biosram.h M src/soc/amd/common/block/include/amdblocks/car.h M src/soc/amd/common/block/include/amdblocks/chip.h M src/soc/amd/common/block/include/amdblocks/dimm_spd.h M src/soc/amd/common/block/include/amdblocks/espi.h M src/soc/amd/common/block/include/amdblocks/gpio_banks.h M src/soc/amd/common/block/include/amdblocks/hda.h M src/soc/amd/common/block/include/amdblocks/image.h M src/soc/amd/common/block/include/amdblocks/lpc.h M src/soc/amd/common/block/include/amdblocks/pci_devs.h M src/soc/amd/common/block/include/amdblocks/psp.h M src/soc/amd/common/block/include/amdblocks/reset.h M src/soc/amd/common/block/include/amdblocks/s3_resume.h M src/soc/amd/common/block/include/amdblocks/sata.h M src/soc/amd/common/block/include/amdblocks/smu.h M src/soc/amd/common/block/include/amdblocks/spi.h 25 files changed, 75 insertions(+), 75 deletions(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve
diff --git a/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h index 5422323..e7d3260 100644 --- a/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h +++ b/src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_CALLOUTS_AGESA_H__ -#define __AMD_BLOCK_CALLOUTS_AGESA_H__ +#ifndef AMD_BLOCK_CALLOUTS_AGESA_H +#define AMD_BLOCK_CALLOUTS_AGESA_H
#include <amdblocks/agesawrapper.h> #include <stdint.h> @@ -69,4 +69,4 @@ extern const BIOS_CALLOUT_STRUCT BiosCallouts[]; extern const int BiosCalloutsLen;
-#endif /* __AMD_BLOCK_CALLOUTS_AGESA_H__ */ +#endif /* AMD_BLOCK_CALLOUTS_AGESA_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index 7a9206d..c6e242a 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_ACPI_H__ -#define __AMD_BLOCK_ACPI_H__ +#ifndef AMD_BLOCK_ACPI_H +#define AMD_BLOCK_ACPI_H
#include <types.h> #include <soc/nvs.h> @@ -44,4 +44,4 @@ void acpi_enable_sci(void); void acpi_disable_sci(void);
-#endif /* __AMD_BLOCK_ACPI_H__ */ +#endif /* AMD_BLOCK_ACPI_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio.h b/src/soc/amd/common/block/include/amdblocks/acpimmio.h index 6d96fcd..932ae47 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef __AMD_BLOCK_ACPIMMIO_H__ -#define __AMD_BLOCK_ACPIMMIO_H__ +#ifndef AMD_BLOCK_ACPIMMIO_H +#define AMD_BLOCK_ACPIMMIO_H
#include <device/mmio.h> #include <types.h> @@ -508,4 +508,4 @@ write8(acpimmio_aoac + reg, value); }
-#endif /* __AMD_BLOCK_ACPIMMIO_H__ */ +#endif /* AMD_BLOCK_ACPIMMIO_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h b/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h index 0e80ff4..abf014c 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef __AMD_BLOCK_ACPIMMIO_MAP_H__ -#define __AMD_BLOCK_ACPIMMIO_MAP_H__ +#ifndef AMD_BLOCK_ACPIMMIO_MAP_H +#define AMD_BLOCK_ACPIMMIO_MAP_H
/* * The following AcpiMmio register block mapping represents definitions @@ -132,4 +132,4 @@
#endif
-#endif /* __AMD_BLOCK_ACPIMMIO_MAP_H__ */ +#endif /* AMD_BLOCK_ACPIMMIO_MAP_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h index 85505d1c..8c08ba0 100644 --- a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h +++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_AGESAWRAPPER_H__ -#define __AMD_BLOCK_AGESAWRAPPER_H__ +#ifndef AMD_BLOCK_AGESAWRAPPER_H +#define AMD_BLOCK_AGESAWRAPPER_H
#include <agesa_headers.h>
@@ -39,4 +39,4 @@ void set_board_env_params(GNB_ENV_CONFIGURATION *params); void soc_customize_init_early(AMD_EARLY_PARAMS *InitEarly);
-#endif /* __AMD_BLOCK_AGESAWRAPPER_H__ */ +#endif /* AMD_BLOCK_AGESAWRAPPER_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h index 7174f5e..45bb987 100644 --- a/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h +++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_AGESAWRAPPER_CALL_H__ -#define __AMD_BLOCK_AGESAWRAPPER_CALL_H__ +#ifndef AMD_BLOCK_AGESAWRAPPER_CALL_H +#define AMD_BLOCK_AGESAWRAPPER_CALL_H
#include <amdblocks/agesawrapper.h> #include <stdint.h> @@ -41,4 +41,4 @@ return (u32)ret; }
-#endif /* __AMD_BLOCK_AGESAWRAPPER_CALL_H__ */ +#endif /* AMD_BLOCK_AGESAWRAPPER_CALL_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/alink.h b/src/soc/amd/common/block/include/amdblocks/alink.h index be1917c..73373bd 100644 --- a/src/soc/amd/common/block/include/amdblocks/alink.h +++ b/src/soc/amd/common/block/include/amdblocks/alink.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_ALINK_H__ -#define __AMD_BLOCK_ALINK_H__ +#ifndef AMD_BLOCK_ALINK_H +#define AMD_BLOCK_ALINK_H
#include <stdint.h>
@@ -32,4 +32,4 @@ void alink_ab_indx(u32 reg_space, u32 reg_addr, u32 mask, u32 val); void alink_ax_indx(u32 space /* c or p? */, u32 axindc, u32 mask, u32 val);
-#endif /* __AMD_BLOCK_ALINK_H__ */ +#endif /* AMD_BLOCK_ALINK_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h b/src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h index 067ff98..bcac45a 100644 --- a/src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h +++ b/src/soc/amd/common/block/include/amdblocks/amd_pci_mmconf.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_PCI_MMCONF_H__ -#define __AMD_BLOCK_PCI_MMCONF_H__ +#ifndef AMD_BLOCK_PCI_MMCONF_H +#define AMD_BLOCK_PCI_MMCONF_H
void enable_pci_mmconf(void);
-#endif /* __AMD_BLOCK_PCI_MMCONF_H__ */ +#endif /* AMD_BLOCK_PCI_MMCONF_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h index a37c1fd..46fcfbf 100644 --- a/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h +++ b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_PCI_UTIL_H__ -#define __AMD_BLOCK_PCI_UTIL_H__ +#ifndef AMD_BLOCK_PCI_UTIL_H +#define AMD_BLOCK_PCI_UTIL_H
#include <stdint.h> #include <soc/amd_pci_int_defs.h> @@ -31,4 +31,4 @@ void write_pci_int_table(void); const struct irq_idx_name *sb_get_apic_reg_association(size_t *size);
-#endif /* __AMD_BLOCK_PCI_UTIL_H__ */ +#endif /* AMD_BLOCK_PCI_UTIL_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/biosram.h b/src/soc/amd/common/block/include/amdblocks/biosram.h index a7a73e0..934a244 100644 --- a/src/soc/amd/common/block/include/amdblocks/biosram.h +++ b/src/soc/amd/common/block/include/amdblocks/biosram.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_BIOSRAM_H__ -#define __AMD_BLOCK_BIOSRAM_H__ +#ifndef AMD_BLOCK_BIOSRAM_H +#define AMD_BLOCK_BIOSRAM_H
#include <stdint.h>
@@ -26,4 +26,4 @@ /* Returns the saved UMA base */ uint64_t get_uma_base(void);
-#endif /* __AMD_BLOCK_BIOSRAM_H__ */ +#endif /* AMD_BLOCK_BIOSRAM_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/car.h b/src/soc/amd/common/block/include/amdblocks/car.h index 055f294..2f58924 100644 --- a/src/soc/amd/common/block/include/amdblocks/car.h +++ b/src/soc/amd/common/block/include/amdblocks/car.h @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_CAR_H__ -#define __AMD_BLOCK_CAR_H__ +#ifndef AMD_BLOCK_CAR_H +#define AMD_BLOCK_CAR_H
#include <stdint.h>
void ap_teardown_car(uint32_t flags);
-#endif /* __AMD_BLOCK_CAR_H__ */ +#endif /* AMD_BLOCK_CAR_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/chip.h b/src/soc/amd/common/block/include/amdblocks/chip.h index 8794421..c1820e2 100644 --- a/src/soc/amd/common/block/include/amdblocks/chip.h +++ b/src/soc/amd/common/block/include/amdblocks/chip.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_CHIP_H__ -#define __AMD_BLOCK_CHIP_H__ +#ifndef AMD_BLOCK_CHIP_H +#define AMD_BLOCK_CHIP_H
#include <amdblocks/espi.h> #include <amdblocks/spi.h> @@ -28,4 +28,4 @@ */ const struct soc_amd_common_config *soc_get_common_config(void);
-#endif /* __AMD_BLOCK_CHIP_H__ */ +#endif /* AMD_BLOCK_CHIP_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/dimm_spd.h b/src/soc/amd/common/block/include/amdblocks/dimm_spd.h index 5bfb494..d5eb617 100644 --- a/src/soc/amd/common/block/include/amdblocks/dimm_spd.h +++ b/src/soc/amd/common/block/include/amdblocks/dimm_spd.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_DIMM_SPD_H__ -#define __AMD_BLOCK_DIMM_SPD_H__ +#ifndef AMD_BLOCK_DIMM_SPD_H +#define AMD_BLOCK_DIMM_SPD_H
#include <amdblocks/agesawrapper.h> #include <stddef.h> @@ -15,4 +15,4 @@ int mainboard_read_spd(uint8_t spdAddress, char *buf, size_t len); int sb_read_spd(uint8_t spdAddress, char *buf, size_t len);
-#endif /* __AMD_BLOCK_DIMM_SPD_H__ */ +#endif /* AMD_BLOCK_DIMM_SPD_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/espi.h b/src/soc/amd/common/block/include/amdblocks/espi.h index c2d822e..c593e02 100644 --- a/src/soc/amd/common/block/include/amdblocks/espi.h +++ b/src/soc/amd/common/block/include/amdblocks/espi.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_ESPI_H__ -#define __AMD_BLOCK_ESPI_H__ +#ifndef AMD_BLOCK_ESPI_H +#define AMD_BLOCK_ESPI_H
#include <stdint.h> #include <stddef.h> @@ -118,4 +118,4 @@ */ int espi_setup(void);
-#endif /* __AMD_BLOCK_ESPI_H__ */ +#endif /* AMD_BLOCK_ESPI_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h index 4b2bfdd..b6162d7 100644 --- a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h +++ b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_GPIO_BANKS_H__ -#define __AMD_BLOCK_GPIO_BANKS_H__ +#ifndef AMD_BLOCK_GPIO_BANKS_H +#define AMD_BLOCK_GPIO_BANKS_H
#include <types.h>
@@ -361,4 +361,4 @@ /* May be implemented by soc to handle special cases */ void soc_gpio_hook(uint8_t gpio, uint8_t mux);
-#endif /* __AMD_BLOCK_GPIO_BANKS_H__ */ +#endif /* AMD_BLOCK_GPIO_BANKS_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/hda.h b/src/soc/amd/common/block/include/amdblocks/hda.h index 55feb6b..a7a0b84 100644 --- a/src/soc/amd/common/block/include/amdblocks/hda.h +++ b/src/soc/amd/common/block/include/amdblocks/hda.h @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_HDA_H__ -#define __AMD_BLOCK_HDA_H__ +#ifndef AMD_BLOCK_HDA_H +#define AMD_BLOCK_HDA_H
#include <device/device.h>
/* SoC callback to add any quirks to HDA device node in SSDT. */ void hda_soc_ssdt_quirks(const struct device *dev);
-#endif /* __AMD_BLOCK_HDA_H__ */ +#endif /* AMD_BLOCK_HDA_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/image.h b/src/soc/amd/common/block/include/amdblocks/image.h index 92d4002..27c8991 100644 --- a/src/soc/amd/common/block/include/amdblocks/image.h +++ b/src/soc/amd/common/block/include/amdblocks/image.h @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_IMAGE_H__ -#define __AMD_BLOCK_IMAGE_H__ +#ifndef AMD_BLOCK_IMAGE_H +#define AMD_BLOCK_IMAGE_H
#include <stdint.h>
void *amd_find_image(const void *start_address, const void *end_address, uint32_t alignment, const char name[8]);
-#endif /* __AMD_BLOCK_IMAGE_H__ */ +#endif /* AMD_BLOCK_IMAGE_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/lpc.h b/src/soc/amd/common/block/include/amdblocks/lpc.h index 1b69a5b3..fbedb71 100644 --- a/src/soc/amd/common/block/include/amdblocks/lpc.h +++ b/src/soc/amd/common/block/include/amdblocks/lpc.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_LPC_H__ -#define __AMD_BLOCK_LPC_H__ +#ifndef AMD_BLOCK_LPC_H +#define AMD_BLOCK_LPC_H
#include <types.h>
@@ -198,4 +198,4 @@ /* Enable SPI ROM (SPI_ROM_ENABLE, SPI_ROM_ALT_ENABLE) */ void lpc_enable_spi_rom(uint32_t enable);
-#endif /* __AMD_BLOCK_LPC_H__ */ +#endif /* AMD_BLOCK_LPC_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/pci_devs.h b/src/soc/amd/common/block/include/amdblocks/pci_devs.h index 8a38ac1..074bdd8 100644 --- a/src/soc/amd/common/block/include/amdblocks/pci_devs.h +++ b/src/soc/amd/common/block/include/amdblocks/pci_devs.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_PCI_DEVS_H__ -#define __AMD_BLOCK_PCI_DEVS_H__ +#ifndef AMD_BLOCK_PCI_DEVS_H +#define AMD_BLOCK_PCI_DEVS_H
#include <device/pci_def.h>
@@ -12,4 +12,4 @@ #define _SOC_DEV(slot, func) PCI_DEV(0, slot, func) #endif
-#endif /* __AMD_BLOCK_PCI_DEVS_H__ */ +#endif /* AMD_BLOCK_PCI_DEVS_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/psp.h b/src/soc/amd/common/block/include/amdblocks/psp.h index f509a5a..8cd8236 100644 --- a/src/soc/amd/common/block/include/amdblocks/psp.h +++ b/src/soc/amd/common/block/include/amdblocks/psp.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_PSP_H__ -#define __AMD_BLOCK_PSP_H__ +#ifndef AMD_BLOCK_PSP_H +#define AMD_BLOCK_PSP_H
/* Get the mailbox base address - specific to family of device. */ void *soc_get_mbox_address(void); @@ -74,4 +74,4 @@
int psp_load_named_blob(enum psp_blob_type type, const char *name);
-#endif /* __AMD_BLOCK_PSP_H__ */ +#endif /* AMD_BLOCK_PSP_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/reset.h b/src/soc/amd/common/block/include/amdblocks/reset.h index 7912bd2..b825f47 100644 --- a/src/soc/amd/common/block/include/amdblocks/reset.h +++ b/src/soc/amd/common/block/include/amdblocks/reset.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_RESET_H__ -#define __AMD_BLOCK_RESET_H__ +#ifndef AMD_BLOCK_RESET_H +#define AMD_BLOCK_RESET_H
#include <console/console.h> #include <arch/cache.h> @@ -26,4 +26,4 @@ halt(); }
-#endif /* __AMD_BLOCK_RESET_H__ */ +#endif /* AMD_BLOCK_RESET_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/s3_resume.h b/src/soc/amd/common/block/include/amdblocks/s3_resume.h index 6931a5f..f7fce00 100644 --- a/src/soc/amd/common/block/include/amdblocks/s3_resume.h +++ b/src/soc/amd/common/block/include/amdblocks/s3_resume.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_S3_RESUME_H__ -#define __AMD_BLOCK_S3_RESUME_H__ +#ifndef AMD_BLOCK_S3_RESUME_H +#define AMD_BLOCK_S3_RESUME_H
#include <agesa_headers.h>
@@ -9,4 +9,4 @@ AGESA_STATUS OemS3LateRestore(S3_DATA_BLOCK *dataBlock); AGESA_STATUS OemS3Save(S3_DATA_BLOCK *dataBlock);
-#endif /* __AMD_BLOCK_S3_RESUME_H__ */ +#endif /* AMD_BLOCK_S3_RESUME_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/sata.h b/src/soc/amd/common/block/include/amdblocks/sata.h index 945b9cd..03e1577 100644 --- a/src/soc/amd/common/block/include/amdblocks/sata.h +++ b/src/soc/amd/common/block/include/amdblocks/sata.h @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_SATA_H__ -#define __AMD_BLOCK_SATA_H__ +#ifndef AMD_BLOCK_SATA_H +#define AMD_BLOCK_SATA_H
#include <device/device.h>
void soc_enable_sata_features(struct device *dev);
-#endif /* __AMD_BLOCK_SATA_H__ */ +#endif /* AMD_BLOCK_SATA_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/smu.h b/src/soc/amd/common/block/include/amdblocks/smu.h index 57ef3b3..ca5e37a 100644 --- a/src/soc/amd/common/block/include/amdblocks/smu.h +++ b/src/soc/amd/common/block/include/amdblocks/smu.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_SMU_H__ -#define __AMD_BLOCK_SMU_H__ +#ifndef AMD_BLOCK_SMU_H +#define AMD_BLOCK_SMU_H
#include <types.h> #include <soc/smu.h> /* SoC-dependent definitions for SMU access */ @@ -23,4 +23,4 @@ */ enum cb_err send_smu_message(enum smu_message_id message_id, struct smu_payload *arg);
-#endif /* __AMD_BLOCK_SMU_H__ */ +#endif /* AMD_BLOCK_SMU_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/spi.h b/src/soc/amd/common/block/include/amdblocks/spi.h index 18940a3..7da1b24 100644 --- a/src/soc/amd/common/block/include/amdblocks/spi.h +++ b/src/soc/amd/common/block/include/amdblocks/spi.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __AMD_BLOCK_SPI_H__ -#define __AMD_BLOCK_SPI_H__ +#ifndef AMD_BLOCK_SPI_H +#define AMD_BLOCK_SPI_H
#include <types.h>
@@ -108,4 +108,4 @@ void spi_write16(uint8_t reg, uint16_t val); void spi_write32(uint8_t reg, uint32_t val);
-#endif /* __AMD_BLOCK_SPI_H__ */ +#endif /* AMD_BLOCK_SPI_H */
-
Felix Held (Code Review) -
Kyösti Mälkki (Code Review)
-
Marshall Dawson (Code Review)
-
Martin Roth (Code Review)
-
Paul Menzel (Code Review)