mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-25 12:43:25 +08:00
sf_probe: Merge spi_flash_probe_tail into spi_flash_probe
spi_flash_probe_tail is now only called from spi_flash_probe, hence we can merge its body into spi_flash_probe. Reviewed-by: Jagan Teki <jagan@openedev.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mario Six <mario.six@gdsys.cc>
This commit is contained in:
parent
24fc1ec2ee
commit
36890ff0d0
@ -55,10 +55,16 @@ err_read_id:
|
||||
}
|
||||
|
||||
#ifndef CONFIG_DM_SPI_FLASH
|
||||
static struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus)
|
||||
struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs,
|
||||
unsigned int max_hz, unsigned int spi_mode)
|
||||
{
|
||||
struct spi_slave *bus;
|
||||
struct spi_flash *flash;
|
||||
|
||||
bus = spi_setup_slave(busnum, cs, max_hz, spi_mode);
|
||||
if (!bus)
|
||||
return NULL;
|
||||
|
||||
/* Allocate space if needed (not used by sf-uclass */
|
||||
flash = calloc(1, sizeof(*flash));
|
||||
if (!flash) {
|
||||
@ -76,17 +82,6 @@ static struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus)
|
||||
return flash;
|
||||
}
|
||||
|
||||
struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs,
|
||||
unsigned int max_hz, unsigned int spi_mode)
|
||||
{
|
||||
struct spi_slave *bus;
|
||||
|
||||
bus = spi_setup_slave(busnum, cs, max_hz, spi_mode);
|
||||
if (!bus)
|
||||
return NULL;
|
||||
return spi_flash_probe_tail(bus);
|
||||
}
|
||||
|
||||
void spi_flash_free(struct spi_flash *flash)
|
||||
{
|
||||
#ifdef CONFIG_SPI_FLASH_MTD
|
||||
|
Loading…
Reference in New Issue
Block a user