drivers/spi/spi_flash: Pass in spi_slave structure as const to probe functions
Pointer to spi_slave structure can be passed in as const to spi flash probe functions since the probe functions do not need to modify the slave properties. BUG=b:38330715 Change-Id: I956ee777c62dbb811fd6ce2aeb6ae090e1892acd Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/19707 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
7863395ad1
commit
bd9e32efdd
|
@ -126,7 +126,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_adesto(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct adesto_spi_flash_params *params;
|
||||
|
|
|
@ -109,7 +109,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_amic(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct amic_spi_flash_params *params;
|
||||
|
|
|
@ -154,7 +154,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_atmel(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct atmel_spi_flash_params *params;
|
||||
|
|
|
@ -126,7 +126,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_eon(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct eon_spi_flash_params *params;
|
||||
|
|
|
@ -170,7 +170,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_gigadevice(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_gigadevice(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct gigadevice_spi_flash_params *params;
|
||||
|
|
|
@ -192,7 +192,7 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len,
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_macronix(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct macronix_spi_flash_params *params;
|
||||
|
|
|
@ -246,7 +246,7 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len,
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_spansion(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct spansion_spi_flash_params *params;
|
||||
|
|
|
@ -240,7 +240,7 @@ int spi_flash_cmd_status(const struct spi_flash *flash, u8 *reg)
|
|||
static struct {
|
||||
const u8 shift;
|
||||
const u8 idcode;
|
||||
int (*probe) (struct spi_slave *spi, u8 *idcode,
|
||||
int (*probe) (const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
} flashes[] = {
|
||||
/* Keep it sorted by define name */
|
||||
|
@ -282,7 +282,7 @@ static struct {
|
|||
#define IDCODE_LEN (IDCODE_CONT_LEN + IDCODE_PART_LEN)
|
||||
|
||||
int
|
||||
__attribute__((weak)) spi_flash_programmer_probe(struct spi_slave *spi,
|
||||
__attribute__((weak)) spi_flash_programmer_probe(const struct spi_slave *spi,
|
||||
int force,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
|
@ -290,7 +290,8 @@ __attribute__((weak)) spi_flash_programmer_probe(struct spi_slave *spi,
|
|||
return -1;
|
||||
}
|
||||
|
||||
static int __spi_flash_probe(struct spi_slave *spi, struct spi_flash *flash)
|
||||
static int __spi_flash_probe(const struct spi_slave *spi,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
int ret, i, shift;
|
||||
u8 idcode[IDCODE_LEN], *idp;
|
||||
|
|
|
@ -64,25 +64,25 @@ int spi_flash_cmd_erase(const struct spi_flash *flash, u32 offset, size_t len);
|
|||
int spi_flash_cmd_status(const struct spi_flash *flash, u8 *reg);
|
||||
|
||||
/* Manufacturer-specific probe functions */
|
||||
int spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_spansion(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_amic(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_amic(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_atmel(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_eon(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_macronix(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_sst(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_stmicro(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_winbond(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_gigadevice(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_gigadevice(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
int spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_adesto(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash);
|
||||
|
||||
#endif /* SPI_FLASH_INTERNAL_H */
|
||||
|
|
|
@ -314,7 +314,7 @@ sst_unlock(const struct spi_flash *flash)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_sst(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct sst_spi_flash_params *params;
|
||||
|
|
|
@ -222,7 +222,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_stmicro(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct stmicro_spi_flash_params *params;
|
||||
|
|
|
@ -184,7 +184,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode,
|
||||
int spi_flash_probe_winbond(const struct spi_slave *spi, u8 *idcode,
|
||||
struct spi_flash *flash)
|
||||
{
|
||||
const struct winbond_spi_flash_params *params;
|
||||
|
|
|
@ -78,7 +78,7 @@ int spi_flash_probe(unsigned int bus, unsigned int cs, struct spi_flash *flash);
|
|||
* 0 = success
|
||||
* non-zero = error
|
||||
*/
|
||||
int spi_flash_programmer_probe(struct spi_slave *spi, int force,
|
||||
int spi_flash_programmer_probe(const struct spi_slave *spi, int force,
|
||||
struct spi_flash *flash);
|
||||
|
||||
/* All the following functions return 0 on success and non-zero on error. */
|
||||
|
|
|
@ -280,7 +280,7 @@ static int fast_spi_flash_status(const struct spi_flash *flash,
|
|||
* The size of the flash component is always taken from density field in the
|
||||
* SFDP table. FLCOMP.C0DEN is no longer used by the Flash Controller.
|
||||
*/
|
||||
int spi_flash_programmer_probe(struct spi_slave *dev,
|
||||
int spi_flash_programmer_probe(const struct spi_slave *dev,
|
||||
int force, struct spi_flash *flash)
|
||||
{
|
||||
BOILERPLATE_CREATE_CTX(ctx);
|
||||
|
|
|
@ -228,7 +228,7 @@ static int nor_erase(const struct spi_flash *flash, u32 offset, size_t len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int spi_flash_programmer_probe(struct spi_slave *spi,
|
||||
int spi_flash_programmer_probe(const struct spi_slave *spi,
|
||||
int force, struct spi_flash *flash)
|
||||
{
|
||||
static int done;
|
||||
|
|
|
@ -899,7 +899,7 @@ static int ich_hwseq_write(const struct spi_flash *flash, u32 addr, size_t len,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int spi_flash_programmer_probe(struct spi_slave *spi,
|
||||
int spi_flash_programmer_probe(const struct spi_slave *spi,
|
||||
int force, struct spi_flash *flash)
|
||||
{
|
||||
uint32_t flcomp;
|
||||
|
|
Loading…
Reference in New Issue