spl: Remove dev from spl_load_info

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>

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 6d9137c32e0ada617b8f48f1a1d50bd9a0217e36..3d7551a7daee14140205a11244f9275141aa6bee 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -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;

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index d83d70f2f3337e6e5a9af0760ea14a08bbe65c36..af7a28e7c25dc08c640f2e45afc2ad4fd815177c 100644 (file)
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -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;

diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index ee9384fb37ea1a8c6c1ac1ee677e0a7e3ac6ba9a..1b16b7eb452366caf96eb08ffcfa387d9f036c7d 100644 (file)
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -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);

diff --git a/include/spl.h b/include/spl.h
index 8ff20adc28ec9a3a0de3278034675cf442ed3a8c..951e136b9ea8a511a3a9cbea3de20e1330bfa1e6 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -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;
 };
 
 /*