drivers/spi/spi_flash: Pass in flash structure to fill in probe
Instead of making all SPI drivers allocate space for a spi_flash structure and fill it in, udpate the API to allow callers to pass in a spi_flash structure that can be filled by the flash drivers as required. This also cleans up the interface so that the callers can maintain and free the space for spi_flash structure as required. BUG=b:38330715 Change-Id: If6f1b403731466525c4690777d9b32ce778eb563 Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/19705 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
		
				
					committed by
					
						 Furquan Shaikh
						Furquan Shaikh
					
				
			
			
				
	
			
			
			
						parent
						
							fc1a123aa7
						
					
				
				
					commit
					30221b45e0
				
			| @@ -126,10 +126,10 @@ out: | ||||
| 	return ret; | ||||
| } | ||||
|  | ||||
| struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode) | ||||
| int spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode, | ||||
| 			struct spi_flash *flash) | ||||
| { | ||||
| 	const struct eon_spi_flash_params *params; | ||||
| 	struct spi_flash *flash; | ||||
| 	unsigned int i; | ||||
|  | ||||
| 	for (i = 0; i < ARRAY_SIZE(eon_spi_flash_table); ++i) { | ||||
| @@ -141,13 +141,7 @@ struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode) | ||||
| 	if (i == ARRAY_SIZE(eon_spi_flash_table)) { | ||||
| 		printk(BIOS_WARNING, "SF: Unsupported EON ID %#02x%02x\n", | ||||
| 		       idcode[1], idcode[2]); | ||||
| 		return NULL; | ||||
| 	} | ||||
|  | ||||
| 	flash = malloc(sizeof(*flash)); | ||||
| 	if (!flash) { | ||||
| 		printk(BIOS_WARNING, "SF: Failed to allocate memory\n"); | ||||
| 		return NULL; | ||||
| 		return -1; | ||||
| 	} | ||||
|  | ||||
| 	memcpy(&flash->spi, spi, sizeof(*spi)); | ||||
| @@ -164,5 +158,5 @@ struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode) | ||||
| 	flash->internal_status = spi_flash_cmd_status; | ||||
| 	flash->internal_read = spi_flash_cmd_read_fast; | ||||
|  | ||||
| 	return flash; | ||||
| 	return 0; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user