From b0b0c8c60a6072d1b0707f9b9b87650570b35ea3 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Sun, 8 Jul 2018 12:33:47 +0200 Subject: src/{device,drivers}: Use "foo *bar" instead of "foo* bar" Change-Id: Ic1c9b1edd8d3206a68854107ddcbc5c51cb487c3 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/27404 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/drivers/amd/agesa/oem_s3.c | 2 +- src/drivers/amd/agesa/romstage.c | 2 +- src/drivers/amd/agesa/state_machine.c | 10 +++++----- src/drivers/aspeed/common/aspeed_coreboot.h | 2 +- src/drivers/i2c/tpm/tpm.c | 2 +- src/drivers/intel/fsp1_0/fastboot_cache.c | 2 +- src/drivers/intel/fsp1_0/fsp_util.c | 13 +++++++------ src/drivers/intel/fsp1_0/fsp_util.h | 16 ++++++++-------- src/drivers/intel/fsp1_0/hob.c | 10 +++++----- src/drivers/intel/gma/edid.c | 2 +- src/drivers/intel/i210/i210.c | 12 ++++++------ src/drivers/pc80/tpm/tis.c | 8 ++++---- src/drivers/usb/ehci_debug.c | 2 +- src/drivers/usb/gadget.c | 2 +- src/drivers/xgi/common/xgi_coreboot.c | 5 +++-- 15 files changed, 46 insertions(+), 44 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/amd/agesa/oem_s3.c b/src/drivers/amd/agesa/oem_s3.c index 1ca6e5b2f6..ad193e15d8 100644 --- a/src/drivers/amd/agesa/oem_s3.c +++ b/src/drivers/amd/agesa/oem_s3.c @@ -161,5 +161,5 @@ const void *OemS3Saved_MTRR_Storage(void) if (!size) return NULL; - return (void*)(pos + sizeof(UINT32)); + return (void *)(pos + sizeof(UINT32)); } diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c index c42792716c..90fa0598f9 100644 --- a/src/drivers/amd/agesa/romstage.c +++ b/src/drivers/amd/agesa/romstage.c @@ -54,7 +54,7 @@ static void fill_sysinfo(struct sysinfo *cb) agesa_set_interface(cb); } -void * asmlinkage romstage_main(unsigned long bist) +void *asmlinkage romstage_main(unsigned long bist) { struct postcar_frame pcf; struct sysinfo romstage_state; diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c index b73c1244d8..673bf9b9a0 100644 --- a/src/drivers/amd/agesa/state_machine.c +++ b/src/drivers/amd/agesa/state_machine.c @@ -53,7 +53,7 @@ static void agesa_locate_image(AMD_CONFIG_PARAMS *StdHeader) image = LibAmdLocateImage(agesa, agesa + file_size, 4096, ModuleIdentifier); - StdHeader->ImageBasePtr = (void*) image; + StdHeader->ImageBasePtr = (void *) image; #endif } @@ -66,10 +66,10 @@ void agesa_set_interface(struct sysinfo *cb) if (IS_ENABLED(CONFIG_CPU_AMD_AGESA_BINARY_PI)) { agesa_locate_image(&cb->StdHeader); AMD_IMAGE_HEADER *image = - (void*)(uintptr_t)cb->StdHeader.ImageBasePtr; + (void *)(uintptr_t)cb->StdHeader.ImageBasePtr; ASSERT(image); AMD_MODULE_HEADER *module = - (void*)(uintptr_t)image->ModuleInfoOffset; + (void *)(uintptr_t)image->ModuleInfoOffset; ASSERT(module && module->ModuleDispatcher); } } @@ -83,8 +83,8 @@ AGESA_STATUS module_dispatch(AGESA_STRUCT_NAME func, dispatcher = AmdAgesaDispatcher; #endif #if IS_ENABLED(CONFIG_CPU_AMD_AGESA_BINARY_PI) - AMD_IMAGE_HEADER *image = (void*)(uintptr_t)StdHeader->ImageBasePtr; - AMD_MODULE_HEADER *module = (void*)(uintptr_t)image->ModuleInfoOffset; + AMD_IMAGE_HEADER *image = (void *)(uintptr_t)StdHeader->ImageBasePtr; + AMD_MODULE_HEADER *module = (void *)(uintptr_t)image->ModuleInfoOffset; dispatcher = module->ModuleDispatcher; #endif diff --git a/src/drivers/aspeed/common/aspeed_coreboot.h b/src/drivers/aspeed/common/aspeed_coreboot.h index 5a208e6046..b974840308 100644 --- a/src/drivers/aspeed/common/aspeed_coreboot.h +++ b/src/drivers/aspeed/common/aspeed_coreboot.h @@ -73,7 +73,7 @@ struct drm_device { }; static inline void *kzalloc(size_t size, int flags) { - void* ptr = malloc(size); + void *ptr = malloc(size); memset(ptr, 0, size); return ptr; } diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c index 7d69861586..447fc2464f 100644 --- a/src/drivers/i2c/tpm/tpm.c +++ b/src/drivers/i2c/tpm/tpm.c @@ -65,7 +65,7 @@ enum i2c_chip_type { UNKNOWN, }; -static const char * const chip_name[] = { +static const char *const chip_name[] = { [SLB9635] = "slb9635tt", [SLB9645] = "slb9645tt", [UNKNOWN] = "unknown/fallback to slb9635", diff --git a/src/drivers/intel/fsp1_0/fastboot_cache.c b/src/drivers/intel/fsp1_0/fastboot_cache.c index 906b356b90..76241c8f90 100644 --- a/src/drivers/intel/fsp1_0/fastboot_cache.c +++ b/src/drivers/intel/fsp1_0/fastboot_cache.c @@ -224,7 +224,7 @@ void update_mrc_cache(void *unused) #endif /* !defined(__PRE_RAM__) */ -void * find_and_set_fastboot_cache(void) +void *find_and_set_fastboot_cache(void) { struct mrc_data_container *mrc_cache = NULL; if (((mrc_cache = find_current_mrc_cache()) == NULL) || diff --git a/src/drivers/intel/fsp1_0/fsp_util.c b/src/drivers/intel/fsp1_0/fsp_util.c index 5a6321d220..c19c1a1186 100644 --- a/src/drivers/intel/fsp1_0/fsp_util.c +++ b/src/drivers/intel/fsp1_0/fsp_util.c @@ -75,7 +75,7 @@ void __attribute__((noreturn)) fsp_early_init (FSP_INFO_HEADER *fsp_ptr) UPD_DATA_REGION fsp_upd_data; #endif - memset((void*)&FspRtBuffer, 0, sizeof(FSP_INIT_RT_BUFFER)); + memset((void *)&FspRtBuffer, 0, sizeof(FSP_INIT_RT_BUFFER)); FspRtBuffer.Common.StackTop = (u32 *)CONFIG_RAMTOP; FspInitParams.NvsBufferPtr = NULL; @@ -100,7 +100,7 @@ void __attribute__((noreturn)) fsp_early_init (FSP_INFO_HEADER *fsp_ptr) } #endif /* __PRE_RAM__ */ -volatile u8 * find_fsp () +volatile u8 *find_fsp() { #ifdef __PRE_RAM__ @@ -175,7 +175,7 @@ volatile u8 * find_fsp () * @param hob_list_ptr pointer to the start of the hob list * @return pointer to saved CAR MEM or NULL if not found. */ -void * find_saved_temp_mem(void *hob_list_ptr) +void *find_saved_temp_mem(void *hob_list_ptr) { EFI_GUID temp_hob_guid = FSP_BOOTLOADER_TEMPORARY_MEMORY_HOB_GUID; EFI_HOB_GUID_TYPE *saved_mem_hob = @@ -194,7 +194,7 @@ void * find_saved_temp_mem(void *hob_list_ptr) * @param hob_list_ptr pointer to the start of the hob list * @return pointer to the start of the FSP reserved memory or NULL if not found. */ -void * find_fsp_reserved_mem(void *hob_list_ptr) +void *find_fsp_reserved_mem(void *hob_list_ptr) { EFI_GUID fsp_reserved_guid = FSP_HOB_RESOURCE_OWNER_FSP_GUID; EFI_HOB_RESOURCE_DESCRIPTOR *fsp_reserved_mem = @@ -221,7 +221,8 @@ void print_fsp_info(void) { } if (FspHobListPtr == NULL) { - FspHobListPtr = (void*)*((u32*) cbmem_find(CBMEM_ID_HOB_POINTER)); + FspHobListPtr = (void *)*((u32 *) + cbmem_find(CBMEM_ID_HOB_POINTER)); } printk(BIOS_SPEW,"fsp_header_ptr: %p\n", fsp_header_ptr); @@ -294,7 +295,7 @@ int save_mrc_data(void *hob_start) static void find_fsp_hob_update_mrc(void *unused) { /* Set the global HOB list pointer */ - FspHobListPtr = (void*)*((u32*) cbmem_find(CBMEM_ID_HOB_POINTER)); + FspHobListPtr = (void *)*((u32 *) cbmem_find(CBMEM_ID_HOB_POINTER)); if (!FspHobListPtr){ printk(BIOS_ERR, "ERROR: Could not find FSP HOB pointer in CBFS!\n"); diff --git a/src/drivers/intel/fsp1_0/fsp_util.h b/src/drivers/intel/fsp1_0/fsp_util.h index a3a7dd3119..594a25939f 100644 --- a/src/drivers/intel/fsp1_0/fsp_util.h +++ b/src/drivers/intel/fsp1_0/fsp_util.h @@ -22,10 +22,10 @@ #if IS_ENABLED(CONFIG_ENABLE_MRC_CACHE) int save_mrc_data(void *hob_start); -void * find_and_set_fastboot_cache(void); +void *find_and_set_fastboot_cache(void); #endif -volatile u8 * find_fsp(void); +volatile u8 *find_fsp(void); void fsp_early_init(FSP_INFO_HEADER *fsp_info); void FspNotify(u32 Phase); void FspNotifyReturnPoint(EFI_STATUS Status, VOID *HobListPtr); @@ -34,16 +34,16 @@ void print_fsp_info(void); void chipset_fsp_early_init(FSP_INIT_PARAMS *FspInitParams, FSP_INFO_HEADER *fsp_ptr); void ChipsetFspReturnPoint(EFI_STATUS Status, VOID *HobListPtr); -void * find_saved_temp_mem(void *hob_list_ptr); -void * find_fsp_reserved_mem(void *hob_list_ptr); +void *find_saved_temp_mem(void *hob_list_ptr); +void *find_fsp_reserved_mem(void *hob_list_ptr); /* functions in hob.c */ void print_hob_mem_attributes(void *Hobptr); void print_hob_type_structure(u16 Hobtype, void *Hoblistptr); void print_hob_resource_attributes(void *Hobptr); void print_guid_type_attributes(void *Hobptr); -const char * get_hob_type_string(void *Hobptr); -void * find_hob_by_guid(void *Hoblistptr, EFI_GUID *guid1); +const char *get_hob_type_string(void *Hobptr); +void *find_hob_by_guid(void *Hoblistptr, EFI_GUID *guid1); uint8_t guids_are_equal(EFI_GUID *guid1, EFI_GUID *guid2); void printguid(EFI_GUID *guid); @@ -90,10 +90,10 @@ void update_mrc_cache(void *unused); #define FSP_SIG 0x48505346 /* 'FSPH' */ #define ERROR_NO_FV_SIG 1 -#define ERROR_NO_FFS_GUID 2 +#define ERROR_NO_FFS_GUID 2 #define ERROR_NO_INFO_HEADER 3 #define ERROR_IMAGEBASE_MISMATCH 4 -#define ERROR_INFO_HEAD_SIG_MISMATCH 5 +#define ERROR_INFO_HEAD_SIG_MISMATCH 5 #define ERROR_FSP_SIG_MISMATCH 6 #ifndef __PRE_RAM__ diff --git a/src/drivers/intel/fsp1_0/hob.c b/src/drivers/intel/fsp1_0/hob.c index 1c6d0bba69..93348931c1 100644 --- a/src/drivers/intel/fsp1_0/hob.c +++ b/src/drivers/intel/fsp1_0/hob.c @@ -42,7 +42,7 @@ void print_hob_mem_attributes(void *Hobptr) EFI_MEMORY_TYPE Hobmemtype = HobMemoryPtr->AllocDescriptor.MemoryType; u64 Hobmemaddr = HobMemoryPtr->AllocDescriptor.MemoryBaseAddress; u64 Hobmemlength = HobMemoryPtr->AllocDescriptor.MemoryLength; - const char * Hobmemtypenames[15]; + const char *Hobmemtypenames[15]; Hobmemtypenames[0] = "EfiReservedMemoryType"; Hobmemtypenames[1] = "EfiLoaderCode"; @@ -104,7 +104,7 @@ void print_hob_resource_attributes(void *Hobptr) (unsigned long)Hobresaddr, (unsigned long)Hobreslength); } -const char * get_hob_type_string(void *Hobptr) +const char *get_hob_type_string(void *Hobptr) { EFI_HOB_GENERIC_HEADER *HobHeaderPtr = (EFI_HOB_GENERIC_HEADER *)Hobptr; u16 Hobtype = HobHeaderPtr->HobType; @@ -215,7 +215,7 @@ void print_hob_type_structure(u16 Hobtype, void *Hoblistptr) * @param guid the GUID of the HOB entry to find * @return pointer to the start of the requested HOB or NULL if not found. */ -void * find_hob_by_guid(void *current_hob, EFI_GUID *guid) +void *find_hob_by_guid(void *current_hob, EFI_GUID *guid) { do { switch (((EFI_HOB_GENERIC_HEADER *)current_hob)->HobType) { @@ -255,8 +255,8 @@ void * find_hob_by_guid(void *current_hob, EFI_GUID *guid) */ uint8_t guids_are_equal(EFI_GUID *guid1, EFI_GUID *guid2) { - uint64_t* guid_1 = (void *) guid1; - uint64_t* guid_2 = (void *) guid2; + uint64_t *guid_1 = (void *) guid1; + uint64_t *guid_2 = (void *) guid2; if ((*(guid_1) != *(guid_2)) || (*(guid_1 + 1) != *(guid_2 + 1))) return 0; diff --git a/src/drivers/intel/gma/edid.c b/src/drivers/intel/gma/edid.c index 316e869544..13b301fde9 100644 --- a/src/drivers/intel/gma/edid.c +++ b/src/drivers/intel/gma/edid.c @@ -39,7 +39,7 @@ static void wait_rdy(u8 *mmio) } } -static void intel_gmbus_stop_bus(u8 * mmio, u8 bus) +static void intel_gmbus_stop_bus(u8 *mmio, u8 bus) { wait_rdy(mmio); write32(GMBUS0_ADDR, bus); diff --git a/src/drivers/intel/i210/i210.c b/src/drivers/intel/i210/i210.c index 2eae6a92bd..32d27f7912 100644 --- a/src/drivers/intel/i210/i210.c +++ b/src/drivers/intel/i210/i210.c @@ -26,7 +26,7 @@ /* This is a private function to wait for a bit mask in a given register */ /* To avoid endless loops, a time-out is implemented here. */ -static int wait_done(uint32_t* reg, uint32_t mask) +static int wait_done(uint32_t *reg, uint32_t mask) { uint32_t timeout = I210_POLL_TIMEOUT_US; @@ -58,7 +58,7 @@ static uint32_t read_flash(struct device *dev, uint32_t address, bar = pci_read_config32(dev, PCI_BASE_ADDRESS_0); if ((!bar) || ((address + count) > 0x40)) return I210_INVALID_PARAM; - eeprd = (uint32_t*)(bar + I210_REG_EEREAD); + eeprd = (uint32_t *)(bar + I210_REG_EEREAD); /* Prior to start ensure flash interface is ready by checking DONE-bit */ if (wait_done(eeprd, I210_DONE)) return I210_NOT_READY; @@ -122,8 +122,8 @@ static uint32_t write_flash(struct device *dev, uint32_t address, bar = pci_read_config32(dev, 0x10); if ((!bar) || ((address + count) > 0x40)) return I210_INVALID_PARAM; - eepwr = (uint32_t*)(bar + I210_REG_EEWRITE); - eectrl = (uint32_t*)(bar + I210_REG_EECTRL); + eepwr = (uint32_t *)(bar + I210_REG_EEWRITE); + eectrl = (uint32_t *)(bar + I210_REG_EECTRL); /* Prior to start ensure flash interface is ready by checking DONE-bit */ if (wait_done(eepwr, I210_DONE)) return I210_NOT_READY; @@ -166,7 +166,7 @@ static uint32_t read_mac_adr(struct device *dev, uint8_t *mac_adr) return I210_READ_ERROR; /* Copy the address into destination. This is done because of possible */ /* not matching alignment for destination to uint16_t boundary. */ - memcpy(mac_adr, (uint8_t*)adr, 6); + memcpy(mac_adr, (uint8_t *)adr, 6); return I210_SUCCESS; } @@ -181,7 +181,7 @@ static uint32_t write_mac_adr(struct device *dev, uint8_t *mac_adr) if (!dev || !mac_adr) return I210_INVALID_PARAM; /* Copy desired address into a local buffer to avoid alignment issues */ - memcpy((uint8_t*)adr, mac_adr, 6); + memcpy((uint8_t *)adr, mac_adr, 6); return write_flash(dev, 0, 3, adr); } diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index 3549173210..495bb4a143 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/src/drivers/pc80/tpm/tis.c @@ -109,13 +109,13 @@ */ struct device_name { u16 dev_id; - const char * const dev_name; + const char *const dev_name; }; struct vendor_name { u16 vendor_id; - const char * vendor_name; - const struct device_name* dev_names; + const char *vendor_name; + const struct device_name *dev_names; }; static const struct device_name atmel_devices[] = { @@ -443,7 +443,7 @@ static u32 tis_probe(void) * Returns 0 on success, TPM_DRIVER_ERR on error (in case the device does * not accept the entire command). */ -static u32 tis_senddata(const u8 * const data, u32 len) +static u32 tis_senddata(const u8 *const data, u32 len) { u32 offset = 0; u16 burst = 0; diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index fcc52230c9..52b4bdde6b 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -631,7 +631,7 @@ void usbdebug_re_enable(unsigned ehci_base) diff = (unsigned)dbg_info->ehci_base - ehci_base; dbg_info->ehci_debug -= diff; - dbg_info->ehci_base = (void*)ehci_base; + dbg_info->ehci_base = (void *)ehci_base; for (i=0; iep_pipe[i].status & DBGP_EP_VALID) diff --git a/src/drivers/usb/gadget.c b/src/drivers/usb/gadget.c index 37e97a3c1c..3254a8a1c2 100644 --- a/src/drivers/usb/gadget.c +++ b/src/drivers/usb/gadget.c @@ -29,7 +29,7 @@ #define USB_HUB_C_PORT_RESET 20 -static int hub_port_status(const char * buf, int feature) +static int hub_port_status(const char *buf, int feature) { return !!(buf[feature>>3] & (1<<(feature&0x7))); } diff --git a/src/drivers/xgi/common/xgi_coreboot.c b/src/drivers/xgi/common/xgi_coreboot.c index 9cd634ce18..47320fda31 100644 --- a/src/drivers/xgi/common/xgi_coreboot.c +++ b/src/drivers/xgi/common/xgi_coreboot.c @@ -130,8 +130,9 @@ int xgifb_probe(struct pci_dev *pdev, struct xgifb_video_info *xgifb_info) hw_info->ulVideoMemorySize = xgifb_info->video_size; - xgifb_info->video_vbase = hw_info->pjVideoMemoryAddress = (void*)(intptr_t)xgifb_info->video_base; - xgifb_info->mmio_vbase = (void*)(intptr_t)xgifb_info->mmio_base; + xgifb_info->video_vbase = hw_info->pjVideoMemoryAddress = + (void *)(intptr_t)xgifb_info->video_base; + xgifb_info->mmio_vbase = (void *)(intptr_t)xgifb_info->mmio_base; dev_info(&pdev->dev, "Framebuffer at 0x%Lx, mapped to 0x%p, size %dk\n", -- cgit v1.2.3