staging: rts5208: Eliminate the use of Camel Case in files ms.{h, c}

Cleans up checks of "Avoid CamelCase" in files ms.{h,c}

Signed-off-by: Gabriela Bittencourt <gabrielabittencourt00@gmail.com>
Link: https://lore.kernel.org/r/20191031230243.3462-2-gabrielabittencourt00@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c
index e853fa9cc950447126d23d95a66eeff8270c08a4..d53dd138a356bf086d2cdb723039d31bf1b2a35f 100644 (file)
--- a/drivers/staging/rts5208/ms.c
+++ b/drivers/staging/rts5208/ms.c
@@ -590,7 +590,7 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus)
        int retval, i;
        u8 val;
 
-       retval = ms_set_rw_reg_addr(chip, Pro_StatusReg, 6, SystemParm, 1);
+       retval = ms_set_rw_reg_addr(chip, PRO_STATUS_REG, 6, SYSTEM_PARAM, 1);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -840,7 +840,7 @@ static int msxc_change_power(struct rtsx_chip *chip, u8 mode)
 
        ms_cleanup_work(chip);
 
-       retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_DataCount1, 6);
+       retval = ms_set_rw_reg_addr(chip, 0, 0, PRO_DATA_COUNT1, 6);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -885,7 +885,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)
        int found_sys_info = 0, found_model_name = 0;
 #endif
 
-       retval = ms_set_rw_reg_addr(chip, Pro_IntReg, 2, Pro_SystemParm, 7);
+       retval = ms_set_rw_reg_addr(chip, PRO_INT_REG, 2, PRO_SYSTEM_PARAM, 7);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -1232,7 +1232,7 @@ static int ms_read_status_reg(struct rtsx_chip *chip)
        int retval;
        u8 val[2];
 
-       retval = ms_set_rw_reg_addr(chip, StatusReg0, 2, 0, 0);
+       retval = ms_set_rw_reg_addr(chip, STATUS_REG0, 2, 0, 0);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -1255,8 +1255,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,
        int retval, i;
        u8 val, data[10];
 
-       retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                   SystemParm, 6);
+       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                   SYSTEM_PARAM, 6);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -1307,8 +1307,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,
                        if (retval != STATUS_SUCCESS)
                                return STATUS_FAIL;
 
-                       retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
-                                                   MS_EXTRA_SIZE, SystemParm,
+                       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG,
+                                                   MS_EXTRA_SIZE, SYSTEM_PARAM,
                                                    6);
                        if (retval != STATUS_SUCCESS)
                                return STATUS_FAIL;
@@ -1339,8 +1339,8 @@ static int ms_write_extra_data(struct rtsx_chip *chip, u16 block_addr,
        if (!buf || (buf_len < MS_EXTRA_SIZE))
                return STATUS_FAIL;
 
-       retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                   SystemParm, 6 + MS_EXTRA_SIZE);
+       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                   SYSTEM_PARAM, 6 + MS_EXTRA_SIZE);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -1392,8 +1392,8 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)
        int retval;
        u8 val, data[6];
 
-       retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                   SystemParm, 6);
+       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                   SYSTEM_PARAM, 6);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -1465,8 +1465,8 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
-       retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                   SystemParm, 7);
+       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                   SYSTEM_PARAM, 7);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -1519,8 +1519,8 @@ static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk)
        int retval, i = 0;
        u8 val, data[6];
 
-       retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                   SystemParm, 6);
+       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                   SYSTEM_PARAM, 6);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -1579,7 +1579,7 @@ static void ms_set_page_status(u16 log_blk, u8 type, u8 *extra, int extra_len)
 
        memset(extra, 0xFF, MS_EXTRA_SIZE);
 
-       if (type == setPS_NG) {
+       if (type == set_PS_NG) {
                /* set page status as 1:NG,and block status keep 1:OK */
                extra[0] = 0xB8;
        } else {
@@ -1670,8 +1670,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                if (retval != STATUS_SUCCESS)
                        return STATUS_FAIL;
 
-               retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
-                                           MS_EXTRA_SIZE, SystemParm, 6);
+               retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG,
+                                           MS_EXTRA_SIZE, SYSTEM_PARAM, 6);
                if (retval != STATUS_SUCCESS)
                        return STATUS_FAIL;
 
@@ -1725,7 +1725,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                                        return STATUS_FAIL;
 
                                if (uncorrect_flag) {
-                                       ms_set_page_status(log_blk, setPS_NG,
+                                       ms_set_page_status(log_blk, set_PS_NG,
                                                           extra,
                                                           MS_EXTRA_SIZE);
                                        if (i == 0)
@@ -1738,8 +1738,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                                                i, extra[0]);
                                        MS_SET_BAD_BLOCK_FLG(ms_card);
 
-                                       ms_set_page_status(log_blk, setPS_Error,
-                                                          extra,
+                                       ms_set_page_status(log_blk,
+                                                          set_PS_error, extra,
                                                           MS_EXTRA_SIZE);
                                        ms_write_extra_data(chip, new_blk, i,
                                                            extra,
@@ -1767,8 +1767,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                        }
                }
 
-               retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                           SystemParm, (6 + MS_EXTRA_SIZE));
+               retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                           SYSTEM_PARAM, (6 + MS_EXTRA_SIZE));
 
                ms_set_err_code(chip, MS_NO_ERROR);
 
@@ -1822,8 +1822,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                }
 
                if (i == 0) {
-                       retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
-                                                   MS_EXTRA_SIZE, SystemParm,
+                       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG,
+                                                   MS_EXTRA_SIZE, SYSTEM_PARAM,
                                                    7);
                        if (retval != STATUS_SUCCESS)
                                return STATUS_FAIL;
@@ -1980,8 +1980,8 @@ static int reset_ms(struct rtsx_chip *chip)
        for (reg_addr = BLOCK_SIZE_0; reg_addr <= PAGE_SIZE_1; reg_addr++)
                rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
 
-       rtsx_add_cmd(chip, READ_REG_CMD, MS_Device_Type, 0, 0);
-       rtsx_add_cmd(chip, READ_REG_CMD, MS_4bit_Support, 0, 0);
+       rtsx_add_cmd(chip, READ_REG_CMD, MS_device_type, 0, 0);
+       rtsx_add_cmd(chip, READ_REG_CMD, MS_4bit_support, 0, 0);
 
        retval = rtsx_send_cmd(chip, MS_CARD, 100);
        if (retval < 0)
@@ -2057,7 +2057,7 @@ static int reset_ms(struct rtsx_chip *chip)
 
        /* Switch I/F Mode */
        if (ptr[15]) {
-               retval = ms_set_rw_reg_addr(chip, 0, 0, SystemParm, 1);
+               retval = ms_set_rw_reg_addr(chip, 0, 0, SYSTEM_PARAM, 1);
                if (retval != STATUS_SUCCESS)
                        return STATUS_FAIL;
 
@@ -2887,7 +2887,7 @@ int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
-       retval = ms_set_rw_reg_addr(chip, 0x00, 0x00, Pro_TPCParm, 0x01);
+       retval = ms_set_rw_reg_addr(chip, 0x00, 0x00, PRO_TPC_PARM, 0x01);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -2970,8 +2970,8 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
                }
        }
 
-       retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                   SystemParm, 6);
+       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                   SYSTEM_PARAM, 6);
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -3026,7 +3026,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
                                        if (!(chip->card_wp & MS_CARD)) {
                                                reset_ms(chip);
                                                ms_set_page_status
-                                                       (log_blk, setPS_NG,
+                                                       (log_blk, set_PS_NG,
                                                         extra,
                                                         MS_EXTRA_SIZE);
                                                ms_write_extra_data
@@ -3131,8 +3131,8 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
        u8 *ptr;
 
        if (!start_page) {
-               retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                           SystemParm, 7);
+               retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                           SYSTEM_PARAM, 7);
                if (retval != STATUS_SUCCESS)
                        return STATUS_FAIL;
 
@@ -3165,8 +3165,8 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
                        return STATUS_FAIL;
        }
 
-       retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                   SystemParm, (6 + MS_EXTRA_SIZE));
+       retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
+                                   SYSTEM_PARAM, (6 + MS_EXTRA_SIZE));
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
 
@@ -3773,9 +3773,9 @@ static int mg_set_tpc_para_sub(struct rtsx_chip *chip, int type,
        u8 buf[6];
 
        if (type == 0)
-               retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_TPCParm, 1);
+               retval = ms_set_rw_reg_addr(chip, 0, 0, PRO_TPC_PARM, 1);
        else
-               retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_DataCount1, 6);
+               retval = ms_set_rw_reg_addr(chip, 0, 0, PRO_DATA_COUNT1, 6);
 
        if (retval != STATUS_SUCCESS)
                return STATUS_FAIL;
@@ -4154,7 +4154,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                } else {
                        set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
                }
-               goto SetICVFinish;
+               goto set_ICV_finish;
        }
 
 #ifdef MG_SET_ICV_SLOW
@@ -4195,7 +4195,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                                               SENSE_TYPE_MG_WRITE_ERR);
                        }
                        retval = STATUS_FAIL;
-                       goto SetICVFinish;
+                       goto set_ICV_finish;
                }
        }
 #else
@@ -4214,11 +4214,11 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                } else {
                        set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
                }
-               goto SetICVFinish;
+               goto set_ICV_finish;
        }
 #endif
 
-SetICVFinish:
+set_ICV_finish:
        kfree(buf);
        return retval;
 }

diff --git a/drivers/staging/rts5208/ms.h b/drivers/staging/rts5208/ms.h
index 952cc14dd079392afb73c0a3df839a00486d3861..33bda9ce36b67c8300485adaebaadc489efb31e6 100644 (file)
--- a/drivers/staging/rts5208/ms.h
+++ b/drivers/staging/rts5208/ms.h
@@ -92,37 +92,37 @@
 #define PRO_FORMAT             0x10
 #define PRO_SLEEP              0x11
 
-#define        IntReg                  0x01
-#define StatusReg0             0x02
-#define StatusReg1             0x03
-
-#define SystemParm             0x10
-#define BlockAdrs              0x11
-#define CMDParm                        0x14
-#define PageAdrs               0x15
-
-#define OverwriteFlag          0x16
-#define ManagemenFlag          0x17
-#define LogicalAdrs            0x18
-#define ReserveArea            0x1A
-
-#define        Pro_IntReg              0x01
-#define Pro_StatusReg          0x02
-#define Pro_TypeReg            0x04
-#define        Pro_IFModeReg           0x05
-#define Pro_CatagoryReg                0x06
-#define Pro_ClassReg           0x07
-
-#define Pro_SystemParm         0x10
-#define Pro_DataCount1         0x11
-#define Pro_DataCount0         0x12
-#define Pro_DataAddr3          0x13
-#define Pro_DataAddr2          0x14
-#define Pro_DataAddr1          0x15
-#define Pro_DataAddr0          0x16
-
-#define Pro_TPCParm            0x17
-#define Pro_CMDParm            0x18
+#define INT_REG                        0x01
+#define STATUS_REG0            0x02
+#define STATUS_REG1            0x03
+
+#define SYSTEM_PARAM           0x10
+#define BLOCK_ADRS             0x11
+#define CMD_PARM               0x14
+#define PAGE_ADRS              0x15
+
+#define OVERWRITE_FLAG         0x16
+#define MANAGEMEN_FLAG         0x17
+#define LOGICAL_ADRS           0x18
+#define RESERVE_AREA           0x1A
+
+#define PRO_INT_REG            0x01
+#define PRO_STATUS_REG         0x02
+#define PRO_TYPE_REG           0x04
+#define PRO_IF_mode_REG                0x05
+#define PRO_CATEGORY_REG       0x06
+#define PRO_CLASS_REG          0x07
+
+#define PRO_SYSTEM_PARAM               0x10
+#define PRO_DATA_COUNT1                0x11
+#define PRO_DATA_COUNT0                0x12
+#define PRO_DATA_ADDR3         0x13
+#define PRO_DATA_ADDR2         0x14
+#define PRO_DATA_ADDR1         0x15
+#define PRO_DATA_ADDR0         0x16
+
+#define PRO_TPC_PARM           0x17
+#define PRO_CMD_PARM           0x18
 
 #define        INT_REG_CED             0x80
 #define        INT_REG_ERR             0x40
@@ -152,12 +152,12 @@
 #define        PAGE_SIZE_0             (PPBUF_BASE2 + 0x1a0 + 8)
 #define        PAGE_SIZE_1             (PPBUF_BASE2 + 0x1a0 + 9)
 
-#define MS_Device_Type         (PPBUF_BASE2 + 0x1D8)
+#define MS_device_type         (PPBUF_BASE2 + 0x1D8)
 
-#define        MS_4bit_Support         (PPBUF_BASE2 + 0x1D3)
+#define MS_4bit_support                (PPBUF_BASE2 + 0x1D3)
 
-#define setPS_NG       1
-#define setPS_Error    0
+#define set_PS_NG      1
+#define set_PS_error   0
 
 #define        PARALLEL_8BIT_IF        0x40
 #define        PARALLEL_4BIT_IF        0x00