3 files changed, 4 insertions, 7 deletions

diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index bf98d63d92b3..390da9bf2d84 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -276,8 +276,7 @@ static void giveback(struct dw_spi *dws)
         queue_work(dws->workqueue, &dws->pump_messages);
         spin_unlock_irqrestore(&dws->lock, flags);
 
-        last_transfer = list_entry(msg->transfers.prev,
-                                        struct spi_transfer,
+        last_transfer = list_last_entry(&msg->transfers, struct spi_transfer,
                                         transfer_list);
 
         if (!last_transfer->cs_change && dws->cs_control)
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 2789b452e711..3c5b90559bec 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -459,9 +459,8 @@ static void giveback(struct pl022 *pl022)
         struct spi_transfer *last_transfer;
         pl022->next_msg_cs_active = false;
 
-        last_transfer = list_entry(pl022->cur_msg->transfers.prev,
-                                        struct spi_transfer,
-                                        transfer_list);
+        last_transfer = list_last_entry(&pl022->cur_msg->transfers,
+                                        struct spi_transfer, transfer_list);
 
         /* Delay if requested before any change in chip select */
         if (last_transfer->delay_usecs)
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index c702fc536a77..41185d0557fa 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -362,8 +362,7 @@ static void giveback(struct driver_data *drv_data)
         drv_data->cur_msg = NULL;
         drv_data->cur_transfer = NULL;
 
-        last_transfer = list_entry(msg->transfers.prev,
-                                        struct spi_transfer,
+        last_transfer = list_last_entry(&msg->transfers, struct spi_transfer,
                                         transfer_list);
 
         /* Delay if requested before any change in chip select */