staging: rts5208: Remove TRACE_RET and TRACE_GOTO macros

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rts5208 / spi.c

diff --git a/drivers/staging/rts5208/spi.c b/drivers/staging/rts5208/spi.c
index 29f4a80844fa61f8440975a7da2c6e9d7087f17f..d3ac6c0b11b5a596066aedde903243b5c1a6b155 100644 (file)
--- a/drivers/staging/rts5208/spi.c
+++ b/drivers/staging/rts5208/spi.c
@@ -25,9 +25,6 @@
 #include <linux/sched.h>
 
 #include "rtsx.h"
-#include "rtsx_transport.h"
-#include "rtsx_scsi.h"
-#include "rtsx_card.h"
 #include "spi.h"
 
 static inline void spi_set_err_code(struct rtsx_chip *chip, u8 err_code)
@@ -56,12 +53,16 @@ static int spi_set_init_para(struct rtsx_chip *chip)
        RTSX_WRITE_REG(chip, SPI_CLK_DIVIDER0, 0xFF, (u8)(spi->clk_div));
 
        retval = switch_clock(chip, spi->spi_clock);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        retval = select_card(chip, SPI_CARD);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        RTSX_WRITE_REG(chip, CARD_CLK_EN, SPI_CLK_EN, SPI_CLK_EN);
        RTSX_WRITE_REG(chip, CARD_OE, SPI_OUTPUT_EN, SPI_OUTPUT_EN);
@@ -69,8 +70,10 @@ static int spi_set_init_para(struct rtsx_chip *chip)
        wait_timeout(10);
 
        retval = spi_init(chip);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        return STATUS_SUCCESS;
 }
@@ -91,7 +94,8 @@ static int sf_polling_status(struct rtsx_chip *chip, int msec)
        if (retval < 0) {
                rtsx_clear_spi_error(chip);
                spi_set_err_code(chip, SPI_BUSY_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        return STATUS_SUCCESS;
@@ -119,7 +123,8 @@ static int sf_enable_write(struct rtsx_chip *chip, u8 ins)
        if (retval < 0) {
                rtsx_clear_spi_error(chip);
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        return STATUS_SUCCESS;
@@ -147,7 +152,8 @@ static int sf_disable_write(struct rtsx_chip *chip, u8 ins)
        if (retval < 0) {
                rtsx_clear_spi_error(chip);
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        return STATUS_SUCCESS;
@@ -205,7 +211,8 @@ static int sf_erase(struct rtsx_chip *chip, u8 ins, u8 addr_mode, u32 addr)
        if (retval < 0) {
                rtsx_clear_spi_error(chip);
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        return STATUS_SUCCESS;
@@ -225,12 +232,16 @@ static int spi_init_eeprom(struct rtsx_chip *chip)
        RTSX_WRITE_REG(chip, SPI_CLK_DIVIDER0, 0xFF, 0x27);
 
        retval = switch_clock(chip, clk);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        retval = select_card(chip, SPI_CARD);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        RTSX_WRITE_REG(chip, CARD_CLK_EN, SPI_CLK_EN, SPI_CLK_EN);
        RTSX_WRITE_REG(chip, CARD_OE, SPI_OUTPUT_EN, SPI_OUTPUT_EN);
@@ -258,8 +269,10 @@ static int spi_eeprom_program_enable(struct rtsx_chip *chip)
                SPI_TRANSFER0_END);
 
        retval = rtsx_send_cmd(chip, 0, 100);
-       if (retval < 0)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval < 0) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        return STATUS_SUCCESS;
 }
@@ -269,12 +282,16 @@ int spi_erase_eeprom_chip(struct rtsx_chip *chip)
        int retval;
 
        retval = spi_init_eeprom(chip);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        retval = spi_eeprom_program_enable(chip);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        rtsx_init_cmd(chip);
 
@@ -288,8 +305,10 @@ int spi_erase_eeprom_chip(struct rtsx_chip *chip)
                SPI_TRANSFER0_END);
 
        retval = rtsx_send_cmd(chip, 0, 100);
-       if (retval < 0)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval < 0) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        RTSX_WRITE_REG(chip, CARD_GPIO_DIR, 0x01, 0x01);
 
@@ -301,12 +320,16 @@ int spi_erase_eeprom_byte(struct rtsx_chip *chip, u16 addr)
        int retval;
 
        retval = spi_init_eeprom(chip);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        retval = spi_eeprom_program_enable(chip);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        rtsx_init_cmd(chip);
 
@@ -322,8 +345,10 @@ int spi_erase_eeprom_byte(struct rtsx_chip *chip, u16 addr)
                SPI_TRANSFER0_END);
 
        retval = rtsx_send_cmd(chip, 0, 100);
-       if (retval < 0)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval < 0) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        RTSX_WRITE_REG(chip, CARD_GPIO_DIR, 0x01, 0x01);
 
@@ -337,8 +362,10 @@ int spi_read_eeprom(struct rtsx_chip *chip, u16 addr, u8 *val)
        u8 data;
 
        retval = spi_init_eeprom(chip);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        rtsx_init_cmd(chip);
 
@@ -355,8 +382,10 @@ int spi_read_eeprom(struct rtsx_chip *chip, u16 addr, u8 *val)
                SPI_TRANSFER0_END);
 
        retval = rtsx_send_cmd(chip, 0, 100);
-       if (retval < 0)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval < 0) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        wait_timeout(5);
        RTSX_READ_REG(chip, SPI_DATA, &data);
@@ -374,12 +403,16 @@ int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val)
        int retval;
 
        retval = spi_init_eeprom(chip);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        retval = spi_eeprom_program_enable(chip);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        rtsx_init_cmd(chip);
 
@@ -396,8 +429,10 @@ int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val)
                SPI_TRANSFER0_END);
 
        retval = rtsx_send_cmd(chip, 0, 100);
-       if (retval < 0)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval < 0) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        RTSX_WRITE_REG(chip, CARD_GPIO_DIR, 0x01, 0x01);
 
@@ -449,13 +484,15 @@ int spi_read_flash_id(struct scsi_cmnd *srb, struct rtsx_chip *chip)
        len = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
        if (len > 512) {
                spi_set_err_code(chip, SPI_INVALID_COMMAND);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        retval = spi_set_init_para(chip);
        if (retval != STATUS_SUCCESS) {
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        rtsx_init_cmd(chip);
@@ -497,19 +534,23 @@ int spi_read_flash_id(struct scsi_cmnd *srb, struct rtsx_chip *chip)
        if (retval < 0) {
                rtsx_clear_spi_error(chip);
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        if (len) {
                buf = kmalloc(len, GFP_KERNEL);
-               if (!buf)
-                       TRACE_RET(chip, STATUS_ERROR);
+               if (!buf) {
+                       rtsx_trace(chip);
+                       return STATUS_ERROR;
+               }
 
                retval = rtsx_read_ppbuf(chip, buf, len);
                if (retval != STATUS_SUCCESS) {
                        spi_set_err_code(chip, SPI_READ_ERR);
                        kfree(buf);
-                       TRACE_RET(chip, STATUS_FAIL);
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
                }
 
                rtsx_stor_set_xfer_buf(buf, scsi_bufflen(srb), srb);
@@ -541,12 +582,15 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
        retval = spi_set_init_para(chip);
        if (retval != STATUS_SUCCESS) {
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        buf = kmalloc(SF_PAGE_LEN, GFP_KERNEL);
-       if (buf == NULL)
-               TRACE_RET(chip, STATUS_ERROR);
+       if (buf == NULL) {
+               rtsx_trace(chip);
+               return STATUS_ERROR;
+       }
 
        while (len) {
                u16 pagelen = SF_PAGE_LEN - (u8)addr;
@@ -598,7 +642,8 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                        kfree(buf);
                        rtsx_clear_spi_error(chip);
                        spi_set_err_code(chip, SPI_HW_ERR);
-                       TRACE_RET(chip, STATUS_FAIL);
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
                }
 
                rtsx_stor_access_xfer_buf(buf, pagelen, srb, &index, &offset,
@@ -634,19 +679,23 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
        retval = spi_set_init_para(chip);
        if (retval != STATUS_SUCCESS) {
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        if (program_mode == BYTE_PROGRAM) {
                buf = kmalloc(4, GFP_KERNEL);
-               if (!buf)
-                       TRACE_RET(chip, STATUS_ERROR);
+               if (!buf) {
+                       rtsx_trace(chip);
+                       return STATUS_ERROR;
+               }
 
                while (len) {
                        retval = sf_enable_write(chip, SPI_WREN);
                        if (retval != STATUS_SUCCESS) {
                                kfree(buf);
-                               TRACE_RET(chip, STATUS_FAIL);
+                               rtsx_trace(chip);
+                               return STATUS_FAIL;
                        }
 
                        rtsx_stor_access_xfer_buf(buf, 1, srb, &index, &offset,
@@ -665,13 +714,15 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                                kfree(buf);
                                rtsx_clear_spi_error(chip);
                                spi_set_err_code(chip, SPI_HW_ERR);
-                               TRACE_RET(chip, STATUS_FAIL);
+                               rtsx_trace(chip);
+                               return STATUS_FAIL;
                        }
 
                        retval = sf_polling_status(chip, 100);
                        if (retval != STATUS_SUCCESS) {
                                kfree(buf);
-                               TRACE_RET(chip, STATUS_FAIL);
+                               rtsx_trace(chip);
+                               return STATUS_FAIL;
                        }
 
                        addr++;
@@ -684,12 +735,16 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                int first_byte = 1;
 
                retval = sf_enable_write(chip, SPI_WREN);
-               if (retval != STATUS_SUCCESS)
-                       TRACE_RET(chip, STATUS_FAIL);
+               if (retval != STATUS_SUCCESS) {
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
+               }
 
                buf = kmalloc(4, GFP_KERNEL);
-               if (!buf)
-                       TRACE_RET(chip, STATUS_ERROR);
+               if (!buf) {
+                       rtsx_trace(chip);
+                       return STATUS_ERROR;
+               }
 
                while (len) {
                        rtsx_stor_access_xfer_buf(buf, 1, srb, &index, &offset,
@@ -713,13 +768,15 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                                kfree(buf);
                                rtsx_clear_spi_error(chip);
                                spi_set_err_code(chip, SPI_HW_ERR);
-                               TRACE_RET(chip, STATUS_FAIL);
+                               rtsx_trace(chip);
+                               return STATUS_FAIL;
                        }
 
                        retval = sf_polling_status(chip, 100);
                        if (retval != STATUS_SUCCESS) {
                                kfree(buf);
-                               TRACE_RET(chip, STATUS_FAIL);
+                               rtsx_trace(chip);
+                               return STATUS_FAIL;
                        }
 
                        len--;
@@ -728,16 +785,22 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                kfree(buf);
 
                retval = sf_disable_write(chip, SPI_WRDI);
-               if (retval != STATUS_SUCCESS)
-                       TRACE_RET(chip, STATUS_FAIL);
+               if (retval != STATUS_SUCCESS) {
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
+               }
 
                retval = sf_polling_status(chip, 100);
-               if (retval != STATUS_SUCCESS)
-                       TRACE_RET(chip, STATUS_FAIL);
+               if (retval != STATUS_SUCCESS) {
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
+               }
        } else if (program_mode == PAGE_PROGRAM) {
                buf = kmalloc(SF_PAGE_LEN, GFP_KERNEL);
-               if (!buf)
-                       TRACE_RET(chip, STATUS_NOMEM);
+               if (!buf) {
+                       rtsx_trace(chip);
+                       return STATUS_NOMEM;
+               }
 
                while (len) {
                        u16 pagelen = SF_PAGE_LEN - (u8)addr;
@@ -748,7 +811,8 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                        retval = sf_enable_write(chip, SPI_WREN);
                        if (retval != STATUS_SUCCESS) {
                                kfree(buf);
-                               TRACE_RET(chip, STATUS_FAIL);
+                               rtsx_trace(chip);
+                               return STATUS_FAIL;
                        }
 
                        rtsx_init_cmd(chip);
@@ -767,13 +831,15 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                                kfree(buf);
                                rtsx_clear_spi_error(chip);
                                spi_set_err_code(chip, SPI_HW_ERR);
-                               TRACE_RET(chip, STATUS_FAIL);
+                               rtsx_trace(chip);
+                               return STATUS_FAIL;
                        }
 
                        retval = sf_polling_status(chip, 100);
                        if (retval != STATUS_SUCCESS) {
                                kfree(buf);
-                               TRACE_RET(chip, STATUS_FAIL);
+                               rtsx_trace(chip);
+                               return STATUS_FAIL;
                        }
 
                        addr += pagelen;
@@ -783,7 +849,8 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                kfree(buf);
        } else {
                spi_set_err_code(chip, SPI_INVALID_COMMAND);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        return STATUS_SUCCESS;
@@ -805,28 +872,38 @@ int spi_erase_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
        retval = spi_set_init_para(chip);
        if (retval != STATUS_SUCCESS) {
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        if (erase_mode == PAGE_ERASE) {
                retval = sf_enable_write(chip, SPI_WREN);
-               if (retval != STATUS_SUCCESS)
-                       TRACE_RET(chip, STATUS_FAIL);
+               if (retval != STATUS_SUCCESS) {
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
+               }
 
                retval = sf_erase(chip, ins, 1, addr);
-               if (retval != STATUS_SUCCESS)
-                       TRACE_RET(chip, STATUS_FAIL);
+               if (retval != STATUS_SUCCESS) {
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
+               }
        } else if (erase_mode == CHIP_ERASE) {
                retval = sf_enable_write(chip, SPI_WREN);
-               if (retval != STATUS_SUCCESS)
-                       TRACE_RET(chip, STATUS_FAIL);
+               if (retval != STATUS_SUCCESS) {
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
+               }
 
                retval = sf_erase(chip, ins, 0, 0);
-               if (retval != STATUS_SUCCESS)
-                       TRACE_RET(chip, STATUS_FAIL);
+               if (retval != STATUS_SUCCESS) {
+                       rtsx_trace(chip);
+                       return STATUS_FAIL;
+               }
        } else {
                spi_set_err_code(chip, SPI_INVALID_COMMAND);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        return STATUS_SUCCESS;
@@ -844,12 +921,15 @@ int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
        retval = spi_set_init_para(chip);
        if (retval != STATUS_SUCCESS) {
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        retval = sf_enable_write(chip, ewsr);
-       if (retval != STATUS_SUCCESS)
-               TRACE_RET(chip, STATUS_FAIL);
+       if (retval != STATUS_SUCCESS) {
+               rtsx_trace(chip);
+               return STATUS_FAIL;
+       }
 
        rtsx_init_cmd(chip);
 
@@ -871,7 +951,8 @@ int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
        if (retval != STATUS_SUCCESS) {
                rtsx_clear_spi_error(chip);
                spi_set_err_code(chip, SPI_HW_ERR);
-               TRACE_RET(chip, STATUS_FAIL);
+               rtsx_trace(chip);
+               return STATUS_FAIL;
        }
 
        return STATUS_SUCCESS;