diff options
| author | Jagan Teki <jteki@openedev.com> | 2015-12-06 21:33:32 +0530 |
|---|---|---|
| committer | Jagan Teki <jteki@openedev.com> | 2015-12-11 22:12:24 +0530 |
| commit | bfdb07eb4b7547ba63bc71c48be8459538f2d781 (patch) | |
| tree | b79e76aa06513bbddb8bb4bd642eca50f87c740f /drivers/mtd/spi/sf_ops.c | |
| parent | b6a2c436e0010f80693f1c22d429c969b67792fd (diff) | |
| download | u-boot-imx-bfdb07eb4b7547ba63bc71c48be8459538f2d781.zip u-boot-imx-bfdb07eb4b7547ba63bc71c48be8459538f2d781.tar.gz u-boot-imx-bfdb07eb4b7547ba63bc71c48be8459538f2d781.tar.bz2 | |
sf: sf_probe: Remove spi_slave pointer argument
Since spi_slave is a spi pointer in spi_flash{} then assign
spi_slave{} pointer to flash->spi and remove spi_slave
pointer argument to
- spi_flash_probe_slave
- spi_flash_scan
Tested-by: Jagan Teki <jteki@openedev.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jagan Teki <jteki@openedev.com>
Diffstat (limited to 'drivers/mtd/spi/sf_ops.c')
| -rw-r--r-- | drivers/mtd/spi/sf_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 68f191b..c065858 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -896,8 +896,9 @@ int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) } #endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ -int spi_flash_scan(struct spi_slave *spi, struct spi_flash *flash) +int spi_flash_scan(struct spi_flash *flash) { + struct spi_slave *spi = flash->spi; const struct spi_flash_params *params; u16 jedec, ext_jedec; u8 idcode[5]; @@ -946,7 +947,6 @@ int spi_flash_scan(struct spi_slave *spi, struct spi_flash *flash) write_sr(flash, 0); /* Assign spi data */ - flash->spi = spi; flash->name = params->name; flash->memory_map = spi->memory_map; flash->dual_flash = flash->spi->option; |