Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: Remove dev from spl_load_info

Browse source 
dev and priv serve the same purpose, and are never set at the same time.
Remove dev and convert all users to priv. While we're at it, reorder bl_len
to be last for better alignment.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson 2023-11-08 11:48:38 -05:00 committed by Tom Rini
parent feaeb8fa6f
commit 0c6c83e6a2
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/spl/spl_mmc.c
View file

@ -65,7 +65,7 @@ static int mmc_load_legacy(struct spl_image_info *spl_image,
static ulong h_spl_load_read(struct spl_load_info *load, ulong sector,
ulong count, void *buf)
{
struct mmc *mmc = load->dev;
struct mmc *mmc = load->priv;
return blk_dread(mmc_get_blk_desc(mmc), sector, count, buf);
}
@ -105,7 +105,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
struct spl_load_info load;
debug("Found FIT\n");
load.dev = mmc;
load.priv = mmc;
load.filename = NULL;
load.bl_len = mmc->read_bl_len;
load.read = h_spl_load_read;
@ -114,7 +114,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
valid_container_hdr((void *)header)) {
struct spl_load_info load;
load.dev = mmc;
load.priv = mmc;
load.filename = NULL;
load.bl_len = mmc->read_bl_len;
load.read = h_spl_load_read;

6
common/spl/spl_spi.c
View file

@ -59,7 +59,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image,
static ulong spl_spi_fit_read(struct spl_load_info *load, ulong sector,
ulong count, void *buf)
{
struct spi_flash *flash = load->dev;
struct spi_flash *flash = load->priv;
ulong ret;
ret = spi_flash_read(flash, sector, count, buf);
@ -151,7 +151,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
struct spl_load_info load;
debug("Found FIT\n");
load.dev = flash;
load.priv = flash;
load.filename = NULL;
load.bl_len = 1;
load.read = spl_spi_fit_read;
@ -162,7 +162,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
valid_container_hdr((void *)header)) {
struct spl_load_info load;
load.dev = flash;
load.priv = flash;
load.filename = NULL;
load.bl_len = 1;
load.read = spl_spi_fit_read;

6
drivers/usb/gadget/f_sdp.c
View file

@ -744,7 +744,7 @@ static ulong sdp_load_read(struct spl_load_info *load, ulong sector,
{
debug("%s: sector %lx, count %lx, buf %lx\n",
__func__, sector, count, (ulong)buf);
memcpy(buf, (void *)(load->dev + sector), count);
memcpy(buf, (void *)(load->priv + sector), count);
return count;
}
@ -844,7 +844,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image,
struct spl_load_info load;
debug("Found FIT\n");
load.dev = header;
load.priv = header;
load.bl_len = 1;
load.read = sdp_load_read;
spl_load_simple_fit(spl_image, &load, 0,
@ -857,7 +857,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image,
valid_container_hdr((void *)header)) {
struct spl_load_info load;
load.dev = header;
load.priv = header;
load.bl_len = 1;
load.read = sdp_load_read;
spl_load_imx_container(spl_image, &load, 0);

4
include/spl.h
View file

@ -285,16 +285,13 @@ static inline void *spl_image_fdt_addr(struct spl_image_info *info)
/**
* Information required to load data from a device
*
* @dev: Pointer to the device, e.g. struct mmc *
* @priv: Private data for the device
* @bl_len: Block length for reading in bytes
* @filename: Name of the fit image file.
* @read: Function to call to read from the device
*/
struct spl_load_info {
void *dev;
void *priv;
int bl_len;
const char *filename;
/**
* read() - Read from device
@ -307,6 +304,7 @@ struct spl_load_info {
*/
ulong (*read)(struct spl_load_info *load, ulong sector, ulong count,
void *buf);
int bl_len;
};
/*