Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / drivers / mtd / spi / atmel.c

diff --git a/drivers/mtd/spi/atmel.c b/drivers/mtd/spi/atmel.c
index fb7a4a939b062530e5c565af2b4bc6e7217ab9a1..a5f51caf460b1a3cedf374307f56c7d741150921 100644 (file)
--- a/drivers/mtd/spi/atmel.c
+++ b/drivers/mtd/spi/atmel.c
@@ -39,9 +39,10 @@ struct atmel_spi_flash_params {
        const char      *name;
 };
 
+/* spi_flash needs to be first so upper layers can free() it */
 struct atmel_spi_flash {
-       const struct atmel_spi_flash_params *params;
        struct spi_flash flash;
+       const struct atmel_spi_flash_params *params;
 };
 
 static inline struct atmel_spi_flash *
@@ -205,7 +206,7 @@ static int dataflash_write_at45(struct spi_flash *flash,
                byte_addr = 0;
        }
 
-       debug("SF: AT45: Successfully programmed %u bytes @ 0x%x\n",
+       debug("SF: AT45: Successfully programmed %zu bytes @ 0x%x\n",
                        len, offset);
        ret = 0;
 
@@ -268,7 +269,7 @@ int dataflash_erase_at45(struct spi_flash *flash, u32 offset, size_t len)
                page_addr++;
        }
 
-       debug("SF: AT45: Successfully erased %u bytes @ 0x%x\n",
+       debug("SF: AT45: Successfully erased %zu bytes @ 0x%x\n",
                        len, offset);
        ret = 0;
 
@@ -351,7 +352,7 @@ struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
                                * params->blocks_per_sector
                                * params->nr_sectors;
 
-       debug("SF: Detected %s with page size %u, total %u bytes\n",
+       debug("SF: Detected %s with page size %lu, total %u bytes\n",
                        params->name, page_size, asf->flash.size);
 
        return &asf->flash;