2 files changed, 42 insertions, 36 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 71a072103a7f..45108ed85588 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -245,6 +245,21 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
         if (from + len > flash->mtd.size)
                 return -EINVAL;
 
+        spi_message_init(&m);
+        memset(t, 0, (sizeof t));
+
+        t[0].tx_buf = flash->command;
+        t[0].len = sizeof(flash->command);
+        spi_message_add_tail(&t[0], &m);
+
+        t[1].rx_buf = buf;
+        t[1].len = len;
+        spi_message_add_tail(&t[1], &m);
+
+        /* Byte count starts at zero. */
+        if (retlen)
+                *retlen = 0;
+
         down(&flash->lock);
 
         /* Wait till previous write/erase is done. */
@@ -254,8 +269,6 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
                 return 1;
         }
 
-        memset(t, 0, (sizeof t));
-
         /* NOTE:  OPCODE_FAST_READ (if available) is faster... */
 
         /* Set up the write data buffer. */
@@ -264,19 +277,6 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
         flash->command[2] = from >> 8;
         flash->command[3] = from;
 
-        /* Byte count starts at zero. */
-        if (retlen)
-                *retlen = 0;
-
-        t[0].tx_buf = flash->command;
-        t[0].len = sizeof(flash->command);
-
-        t[1].rx_buf = buf;
-        t[1].len = len;
-
-        m.transfers = t;
-        m.n_transfer = 2;
-
         spi_sync(flash->spi, &m);
 
         *retlen = m.actual_length - sizeof(flash->command);
@@ -313,6 +313,16 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
         if (to + len > flash->mtd.size)
                 return -EINVAL;
 
+        spi_message_init(&m);
+        memset(t, 0, (sizeof t));
+
+        t[0].tx_buf = flash->command;
+        t[0].len = sizeof(flash->command);
+        spi_message_add_tail(&t[0], &m);
+
+        t[1].tx_buf = buf;
+        spi_message_add_tail(&t[1], &m);
+
         down(&flash->lock);
 
         /* Wait until finished previous write command. */
@@ -321,26 +331,17 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
 
         write_enable(flash);
 
-        memset(t, 0, (sizeof t));
-
         /* Set up the opcode in the write buffer. */
         flash->command[0] = OPCODE_PP;
         flash->command[1] = to >> 16;
         flash->command[2] = to >> 8;
         flash->command[3] = to;
 
-        t[0].tx_buf = flash->command;
-        t[0].len = sizeof(flash->command);
-
-        m.transfers = t;
-        m.n_transfer = 2;
-
         /* what page do we start with? */
         page_offset = to % FLASH_PAGESIZE;
 
         /* do all the bytes fit onto one page? */
         if (page_offset + len <= FLASH_PAGESIZE) {
-                t[1].tx_buf = buf;
                 t[1].len = len;
 
                 spi_sync(flash->spi, &m);
@@ -352,7 +353,6 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
                 /* the size of data remaining on the first page */
                 page_size = FLASH_PAGESIZE - page_offset;
 
-                t[1].tx_buf = buf;
                 t[1].len = page_size;
                 spi_sync(flash->spi, &m);
 
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index a39b3b6b266c..99d3a0320fc9 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -147,7 +147,7 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
 {
         struct dataflash        *priv = (struct dataflash *)mtd->priv;
         struct spi_device       *spi = priv->spi;
-        struct spi_transfer     x[1] = { { .tx_dma = 0, }, };
+        struct spi_transfer     x = { .tx_dma = 0, };
         struct spi_message      msg;
         unsigned                blocksize = priv->page_size << 3;
         u8                      *command;
@@ -162,10 +162,11 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
                         || (instr->addr % priv->page_size) != 0)
                 return -EINVAL;
 
-        x[0].tx_buf = command = priv->command;
-        x[0].len = 4;
-        msg.transfers = x;
-        msg.n_transfer = 1;
+        spi_message_init(&msg);
+
+        x.tx_buf = command = priv->command;
+        x.len = 4;
+        spi_message_add_tail(&x, &msg);
 
         down(&priv->lock);
         while (instr->len > 0) {
@@ -256,12 +257,15 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len,
         DEBUG(MTD_DEBUG_LEVEL3, "READ: (%x) %x %x %x\n",
                 command[0], command[1], command[2], command[3]);
 
+        spi_message_init(&msg);
+
         x[0].tx_buf = command;
         x[0].len = 8;
+        spi_message_add_tail(&x[0], &msg);
+
         x[1].rx_buf = buf;
         x[1].len = len;
-        msg.transfers = x;
-        msg.n_transfer = 2;
+        spi_message_add_tail(&x[1], &msg);
 
         down(&priv->lock);
 
@@ -320,9 +324,11 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
         if ((to + len) > mtd->size)
                 return -EINVAL;
 
+        spi_message_init(&msg);
+
         x[0].tx_buf = command = priv->command;
         x[0].len = 4;
-        msg.transfers = x;
+        spi_message_add_tail(&x[0], &msg);
 
         pageaddr = ((unsigned)to / priv->page_size);
         offset = ((unsigned)to % priv->page_size);
@@ -364,7 +370,6 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
                         DEBUG(MTD_DEBUG_LEVEL3, "TRANSFER: (%x) %x %x %x\n",
                                 command[0], command[1], command[2], command[3]);
 
-                        msg.n_transfer = 1;
                         status = spi_sync(spi, &msg);
                         if (status < 0)
                                 DEBUG(MTD_DEBUG_LEVEL1, "%s: xfer %u -> %d \n",
@@ -385,14 +390,16 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
 
                 x[1].tx_buf = writebuf;
                 x[1].len = writelen;
-                msg.n_transfer = 2;
+                spi_message_add_tail(x + 1, &msg);
                 status = spi_sync(spi, &msg);
+                spi_transfer_del(x + 1);
                 if (status < 0)
                         DEBUG(MTD_DEBUG_LEVEL1, "%s: pgm %u/%u -> %d \n",
                                 spi->dev.bus_id, addr, writelen, status);
 
                 (void) dataflash_waitready(priv->spi);
 
+
 #ifdef  CONFIG_DATAFLASH_WRITE_VERIFY
 
                 /* (3) Compare to Buffer1 */
@@ -405,7 +412,6 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
                 DEBUG(MTD_DEBUG_LEVEL3, "COMPARE: (%x) %x %x %x\n",
                         command[0], command[1], command[2], command[3]);
 
-                msg.n_transfer = 1;
                 status = spi_sync(spi, &msg);
                 if (status < 0)
                         DEBUG(MTD_DEBUG_LEVEL1, "%s: compare %u -> %d \n",