spi: Pass pointer to spi_slave structure in spi_setup_slave
For spi_setup_slave, instead of making the platform driver return a pointer to spi_slave structure, pass in a structure pointer that can be filled in by the driver as required. This removes the need for platform drivers to maintain a slave structure in data/CAR section. BUG=chrome-os-partner:59832 BRANCH=None TEST=Compiles successfully Change-Id: Ia15a4f88ef4dcfdf616bb1c22261e7cb642a7573 Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/17683 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
committed by
Furquan Shaikh
parent
0dba0254ea
commit
36b81af9e8
@ -343,25 +343,24 @@ static struct spi_flash *__spi_flash_probe(struct spi_slave *spi)
|
||||
|
||||
struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs)
|
||||
{
|
||||
struct spi_slave *spi;
|
||||
struct spi_slave spi;
|
||||
struct spi_flash *flash;
|
||||
|
||||
spi = spi_setup_slave(bus, cs);
|
||||
if (!spi) {
|
||||
if (spi_setup_slave(bus, cs, &spi)) {
|
||||
printk(BIOS_WARNING, "SF: Failed to set up slave\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Try special programmer probe if any (without force). */
|
||||
flash = spi_flash_programmer_probe(spi, 0);
|
||||
flash = spi_flash_programmer_probe(&spi, 0);
|
||||
|
||||
/* If flash is not found, try generic spi flash probe. */
|
||||
if (!flash)
|
||||
flash = __spi_flash_probe(spi);
|
||||
flash = __spi_flash_probe(&spi);
|
||||
|
||||
/* If flash is not yet found, force special programmer probe if any. */
|
||||
if (!flash)
|
||||
flash = spi_flash_programmer_probe(spi, 1);
|
||||
flash = spi_flash_programmer_probe(&spi, 1);
|
||||
|
||||
/* Give up -- nothing more to try if flash is not found. */
|
||||
if (!flash) {
|
||||
|
Reference in New Issue
Block a user