1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 61cc5e0c2cbb..84c158a3af2d 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -223,10 +223,9 @@ static void cs_deactive(struct driver_data *drv_data, struct chip_data *chip)
 #define MAX_SPI_SSEL    7
 
 /* stop controller and re-config current chip*/
-static int restore_state(struct driver_data *drv_data)
+static void restore_state(struct driver_data *drv_data)
 {
         struct chip_data *chip = drv_data->cur_chip;
-        int ret = 0;
 
         /* Clear status and disable clock */
         write_STAT(drv_data, BIT_STAT_CLR);
@@ -239,13 +238,6 @@ static int restore_state(struct driver_data *drv_data)
 
         bfin_spi_enable(drv_data);
         cs_active(drv_data, chip);
-
-        if (ret)
-                dev_dbg(&drv_data->pdev->dev,
-                        ": request chip select number %d failed\n",
-                        chip->chip_select_num);
-
-        return ret;
 }
 
 /* used to kick off transfer in rx mode */
@@ -978,10 +970,7 @@ static void pump_messages(struct work_struct *work)
 
         /* Setup the SSP using the per chip configuration */
         drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
-        if (restore_state(drv_data)) {
-                spin_unlock_irqrestore(&drv_data->lock, flags);
-                return;
-        };
+        restore_state(drv_data);
 
         list_del_init(&drv_data->cur_msg->queue);