Skip to content

L
linux
Commit d1af6476 authored by Dilek Uzulmez's avatar Dilek Uzulmez Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rts5208: Remove unnecessary parentheses 

Problem found using checkpatch.pl
CHECK: Unnecessary parentheses around chip->ms_card
Signed-off-by: default avatarDilek Uzulmez <dilekuzulmez@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 040fa221
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 46 deletions
drivers/staging/rts5208/ms.c
View file @ d1af6476
...@@ -30,14 +30,14 @@ ...@@ -30,14 +30,14 @@
static inline void ms_set_err_code(struct rtsx_chip *chip, u8 err_code) static inline void ms_set_err_code(struct rtsx_chip *chip, u8 err_code)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
ms_card->err_code = err_code; ms_card->err_code = err_code;
} }
static inline int ms_check_err_code(struct rtsx_chip *chip, u8 err_code) static inline int ms_check_err_code(struct rtsx_chip *chip, u8 err_code)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
return (ms_card->err_code == err_code); return (ms_card->err_code == err_code);
} }
...@@ -51,7 +51,7 @@ static int ms_parse_err_code(struct rtsx_chip *chip) ...@@ -51,7 +51,7 @@ static int ms_parse_err_code(struct rtsx_chip *chip)
static int ms_transfer_tpc(struct rtsx_chip *chip, u8 trans_mode, static int ms_transfer_tpc(struct rtsx_chip *chip, u8 trans_mode,
u8 tpc, u8 cnt, u8 cfg) u8 tpc, u8 cnt, u8 cfg)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
u8 *ptr; u8 *ptr;
...@@ -185,7 +185,7 @@ static int ms_transfer_data(struct rtsx_chip *chip, u8 trans_mode, ...@@ -185,7 +185,7 @@ static int ms_transfer_data(struct rtsx_chip *chip, u8 trans_mode,
static int ms_write_bytes(struct rtsx_chip *chip, static int ms_write_bytes(struct rtsx_chip *chip,
u8 tpc, u8 cnt, u8 cfg, u8 *data, int data_len) u8 tpc, u8 cnt, u8 cfg, u8 *data, int data_len)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
if (!data || (data_len < cnt)) { if (!data || (data_len < cnt)) {
...@@ -255,7 +255,7 @@ static int ms_write_bytes(struct rtsx_chip *chip, ...@@ -255,7 +255,7 @@ static int ms_write_bytes(struct rtsx_chip *chip,
static int ms_read_bytes(struct rtsx_chip *chip, static int ms_read_bytes(struct rtsx_chip *chip,
u8 tpc, u8 cnt, u8 cfg, u8 *data, int data_len) u8 tpc, u8 cnt, u8 cfg, u8 *data, int data_len)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 *ptr; u8 *ptr;
...@@ -369,7 +369,7 @@ static int ms_send_cmd(struct rtsx_chip *chip, u8 cmd, u8 cfg) ...@@ -369,7 +369,7 @@ static int ms_send_cmd(struct rtsx_chip *chip, u8 cmd, u8 cfg)
static int ms_set_init_para(struct rtsx_chip *chip) static int ms_set_init_para(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
if (CHK_HG8BIT(ms_card)) { if (CHK_HG8BIT(ms_card)) {
...@@ -408,7 +408,7 @@ static int ms_set_init_para(struct rtsx_chip *chip) ...@@ -408,7 +408,7 @@ static int ms_set_init_para(struct rtsx_chip *chip)
static int ms_switch_clock(struct rtsx_chip *chip) static int ms_switch_clock(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
retval = select_card(chip, MS_CARD); retval = select_card(chip, MS_CARD);
...@@ -542,7 +542,7 @@ static int ms_pull_ctl_enable(struct rtsx_chip *chip) ...@@ -542,7 +542,7 @@ static int ms_pull_ctl_enable(struct rtsx_chip *chip)
static int ms_prepare_reset(struct rtsx_chip *chip) static int ms_prepare_reset(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
u8 oc_mask = 0; u8 oc_mask = 0;
...@@ -653,7 +653,7 @@ static int ms_prepare_reset(struct rtsx_chip *chip) ...@@ -653,7 +653,7 @@ static int ms_prepare_reset(struct rtsx_chip *chip)
static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus) static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 val; u8 val;
...@@ -829,7 +829,7 @@ static int ms_switch_parallel_bus(struct rtsx_chip *chip) ...@@ -829,7 +829,7 @@ static int ms_switch_parallel_bus(struct rtsx_chip *chip)
static int ms_switch_8bit_bus(struct rtsx_chip *chip) static int ms_switch_8bit_bus(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 data[2]; u8 data[2];
...@@ -873,7 +873,7 @@ static int ms_switch_8bit_bus(struct rtsx_chip *chip) ...@@ -873,7 +873,7 @@ static int ms_switch_8bit_bus(struct rtsx_chip *chip)
static int ms_pro_reset_flow(struct rtsx_chip *chip, int switch_8bit_bus) static int ms_pro_reset_flow(struct rtsx_chip *chip, int switch_8bit_bus)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
...@@ -994,7 +994,7 @@ static int msxc_change_power(struct rtsx_chip *chip, u8 mode) ...@@ -994,7 +994,7 @@ static int msxc_change_power(struct rtsx_chip *chip, u8 mode)
static int ms_read_attribute_info(struct rtsx_chip *chip) static int ms_read_attribute_info(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 val, *buf, class_code, device_type, sub_class, data[16]; u8 val, *buf, class_code, device_type, sub_class, data[16];
u16 total_blk = 0, blk_size = 0; u16 total_blk = 0, blk_size = 0;
...@@ -1303,7 +1303,7 @@ static int mg_set_tpc_para_sub(struct rtsx_chip *chip, ...@@ -1303,7 +1303,7 @@ static int mg_set_tpc_para_sub(struct rtsx_chip *chip,
static int reset_ms_pro(struct rtsx_chip *chip) static int reset_ms_pro(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
#ifdef XC_POWERCLASS #ifdef XC_POWERCLASS
u8 change_power_class; u8 change_power_class;
...@@ -1421,7 +1421,7 @@ static int ms_read_status_reg(struct rtsx_chip *chip) ...@@ -1421,7 +1421,7 @@ static int ms_read_status_reg(struct rtsx_chip *chip)
static int ms_read_extra_data(struct rtsx_chip *chip, static int ms_read_extra_data(struct rtsx_chip *chip,
u16 block_addr, u8 page_num, u8 *buf, int buf_len) u16 block_addr, u8 page_num, u8 *buf, int buf_len)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 val, data[10]; u8 val, data[10];
...@@ -1516,7 +1516,7 @@ static int ms_read_extra_data(struct rtsx_chip *chip, ...@@ -1516,7 +1516,7 @@ static int ms_read_extra_data(struct rtsx_chip *chip,
static int ms_write_extra_data(struct rtsx_chip *chip, static int ms_write_extra_data(struct rtsx_chip *chip,
u16 block_addr, u8 page_num, u8 *buf, int buf_len) u16 block_addr, u8 page_num, u8 *buf, int buf_len)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 val, data[16]; u8 val, data[16];
...@@ -1585,7 +1585,7 @@ static int ms_write_extra_data(struct rtsx_chip *chip, ...@@ -1585,7 +1585,7 @@ static int ms_write_extra_data(struct rtsx_chip *chip,
static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num) static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
u8 val, data[6]; u8 val, data[6];
...@@ -1670,7 +1670,7 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num) ...@@ -1670,7 +1670,7 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)
static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk) static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
u8 val, data[8], extra[MS_EXTRA_SIZE]; u8 val, data[8], extra[MS_EXTRA_SIZE];
...@@ -1741,7 +1741,7 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk) ...@@ -1741,7 +1741,7 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)
static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk) static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i = 0; int retval, i = 0;
u8 val, data[6]; u8 val, data[6];
...@@ -1862,7 +1862,7 @@ static int ms_init_page(struct rtsx_chip *chip, u16 phy_blk, u16 log_blk, ...@@ -1862,7 +1862,7 @@ static int ms_init_page(struct rtsx_chip *chip, u16 phy_blk, u16 log_blk,
static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
u16 log_blk, u8 start_page, u8 end_page) u16 log_blk, u8 start_page, u8 end_page)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
bool uncorrect_flag = false; bool uncorrect_flag = false;
int retval, rty_cnt; int retval, rty_cnt;
u8 extra[MS_EXTRA_SIZE], val, i, j, data[16]; u8 extra[MS_EXTRA_SIZE], val, i, j, data[16];
...@@ -2155,7 +2155,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, ...@@ -2155,7 +2155,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
static int reset_ms(struct rtsx_chip *chip) static int reset_ms(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
u16 i, reg_addr, block_size; u16 i, reg_addr, block_size;
u8 val, extra[MS_EXTRA_SIZE], j, *ptr; u8 val, extra[MS_EXTRA_SIZE], j, *ptr;
...@@ -2394,7 +2394,7 @@ static int reset_ms(struct rtsx_chip *chip) ...@@ -2394,7 +2394,7 @@ static int reset_ms(struct rtsx_chip *chip)
static int ms_init_l2p_tbl(struct rtsx_chip *chip) static int ms_init_l2p_tbl(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int size, i, seg_no, retval; int size, i, seg_no, retval;
u16 defect_block, reg_addr; u16 defect_block, reg_addr;
u8 val1, val2; u8 val1, val2;
...@@ -2467,7 +2467,7 @@ static int ms_init_l2p_tbl(struct rtsx_chip *chip) ...@@ -2467,7 +2467,7 @@ static int ms_init_l2p_tbl(struct rtsx_chip *chip)
static u16 ms_get_l2p_tbl(struct rtsx_chip *chip, int seg_no, u16 log_off) static u16 ms_get_l2p_tbl(struct rtsx_chip *chip, int seg_no, u16 log_off)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
struct zone_entry *segment; struct zone_entry *segment;
if (ms_card->segment == NULL) if (ms_card->segment == NULL)
...@@ -2484,7 +2484,7 @@ static u16 ms_get_l2p_tbl(struct rtsx_chip *chip, int seg_no, u16 log_off) ...@@ -2484,7 +2484,7 @@ static u16 ms_get_l2p_tbl(struct rtsx_chip *chip, int seg_no, u16 log_off)
static void ms_set_l2p_tbl(struct rtsx_chip *chip, static void ms_set_l2p_tbl(struct rtsx_chip *chip,
int seg_no, u16 log_off, u16 phy_blk) int seg_no, u16 log_off, u16 phy_blk)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
struct zone_entry *segment; struct zone_entry *segment;
if (ms_card->segment == NULL) if (ms_card->segment == NULL)
...@@ -2497,7 +2497,7 @@ static void ms_set_l2p_tbl(struct rtsx_chip *chip, ...@@ -2497,7 +2497,7 @@ static void ms_set_l2p_tbl(struct rtsx_chip *chip,
static void ms_set_unused_block(struct rtsx_chip *chip, u16 phy_blk) static void ms_set_unused_block(struct rtsx_chip *chip, u16 phy_blk)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
struct zone_entry *segment; struct zone_entry *segment;
int seg_no; int seg_no;
...@@ -2513,7 +2513,7 @@ static void ms_set_unused_block(struct rtsx_chip *chip, u16 phy_blk) ...@@ -2513,7 +2513,7 @@ static void ms_set_unused_block(struct rtsx_chip *chip, u16 phy_blk)
static u16 ms_get_unused_block(struct rtsx_chip *chip, int seg_no) static u16 ms_get_unused_block(struct rtsx_chip *chip, int seg_no)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
struct zone_entry *segment; struct zone_entry *segment;
u16 phy_blk; u16 phy_blk;
...@@ -2540,7 +2540,7 @@ static const unsigned short ms_start_idx[] = {0, 494, 990, 1486, 1982, 2478, ...@@ -2540,7 +2540,7 @@ static const unsigned short ms_start_idx[] = {0, 494, 990, 1486, 1982, 2478,
static int ms_arbitrate_l2p(struct rtsx_chip *chip, u16 phy_blk, static int ms_arbitrate_l2p(struct rtsx_chip *chip, u16 phy_blk,
u16 log_off, u8 us1, u8 us2) u16 log_off, u8 us1, u8 us2)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
struct zone_entry *segment; struct zone_entry *segment;
int seg_no; int seg_no;
u16 tmp_blk; u16 tmp_blk;
...@@ -2582,7 +2582,7 @@ static int ms_arbitrate_l2p(struct rtsx_chip *chip, u16 phy_blk, ...@@ -2582,7 +2582,7 @@ static int ms_arbitrate_l2p(struct rtsx_chip *chip, u16 phy_blk,
static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no) static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
struct zone_entry *segment; struct zone_entry *segment;
bool defect_flag; bool defect_flag;
int retval, table_size, disable_cnt, i; int retval, table_size, disable_cnt, i;
...@@ -2818,7 +2818,7 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no) ...@@ -2818,7 +2818,7 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
int reset_ms_card(struct rtsx_chip *chip) int reset_ms_card(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
memset(ms_card, 0, sizeof(struct ms_info)); memset(ms_card, 0, sizeof(struct ms_info));
...@@ -2905,7 +2905,7 @@ static int mspro_set_rw_cmd(struct rtsx_chip *chip, ...@@ -2905,7 +2905,7 @@ static int mspro_set_rw_cmd(struct rtsx_chip *chip,
void mspro_stop_seq_mode(struct rtsx_chip *chip) void mspro_stop_seq_mode(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
if (ms_card->seq_mode) { if (ms_card->seq_mode) {
...@@ -2923,7 +2923,7 @@ void mspro_stop_seq_mode(struct rtsx_chip *chip) ...@@ -2923,7 +2923,7 @@ void mspro_stop_seq_mode(struct rtsx_chip *chip)
static inline int ms_auto_tune_clock(struct rtsx_chip *chip) static inline int ms_auto_tune_clock(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
if (chip->asic_code) { if (chip->asic_code) {
...@@ -2949,7 +2949,7 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, ...@@ -2949,7 +2949,7 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
struct rtsx_chip *chip, u32 start_sector, struct rtsx_chip *chip, u32 start_sector,
u16 sector_cnt) u16 sector_cnt)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
bool mode_2k = false; bool mode_2k = false;
int retval; int retval;
u16 count; u16 count;
...@@ -3092,7 +3092,7 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb, ...@@ -3092,7 +3092,7 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
static int mspro_read_format_progress(struct rtsx_chip *chip, static int mspro_read_format_progress(struct rtsx_chip *chip,
const int short_data_len) const int short_data_len)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u32 total_progress, cur_progress; u32 total_progress, cur_progress;
u8 cnt, tmp; u8 cnt, tmp;
...@@ -3214,7 +3214,7 @@ static int mspro_read_format_progress(struct rtsx_chip *chip, ...@@ -3214,7 +3214,7 @@ static int mspro_read_format_progress(struct rtsx_chip *chip,
void mspro_polling_format_status(struct rtsx_chip *chip) void mspro_polling_format_status(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int i; int i;
if (ms_card->pro_under_formatting && if (ms_card->pro_under_formatting &&
...@@ -3232,7 +3232,7 @@ void mspro_polling_format_status(struct rtsx_chip *chip) ...@@ -3232,7 +3232,7 @@ void mspro_polling_format_status(struct rtsx_chip *chip)
int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip, int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,
int short_data_len, bool quick_format) int short_data_len, bool quick_format)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 buf[8], tmp; u8 buf[8], tmp;
u16 para; u16 para;
...@@ -3324,7 +3324,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk, ...@@ -3324,7 +3324,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
u8 *buf, unsigned int *index, u8 *buf, unsigned int *index,
unsigned int *offset) unsigned int *offset)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 extra[MS_EXTRA_SIZE], page_addr, val, trans_cfg, data[6]; u8 extra[MS_EXTRA_SIZE], page_addr, val, trans_cfg, data[6];
u8 *ptr; u8 *ptr;
...@@ -3508,7 +3508,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk, ...@@ -3508,7 +3508,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
u8 end_page, u8 *buf, unsigned int *index, u8 end_page, u8 *buf, unsigned int *index,
unsigned int *offset) unsigned int *offset)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, i; int retval, i;
u8 page_addr, val, data[16]; u8 page_addr, val, data[16];
u8 *ptr; u8 *ptr;
...@@ -3729,7 +3729,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk, ...@@ -3729,7 +3729,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
u16 log_blk, u8 page_off) u16 log_blk, u8 page_off)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval, seg_no; int retval, seg_no;
retval = ms_copy_page(chip, old_blk, new_blk, log_blk, retval = ms_copy_page(chip, old_blk, new_blk, log_blk,
...@@ -3775,7 +3775,7 @@ static int ms_prepare_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, ...@@ -3775,7 +3775,7 @@ static int ms_prepare_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
#ifdef MS_DELAY_WRITE #ifdef MS_DELAY_WRITE
int ms_delay_write(struct rtsx_chip *chip) int ms_delay_write(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
struct ms_delay_write_tag *delay_write = &(ms_card->delay_write); struct ms_delay_write_tag *delay_write = &(ms_card->delay_write);
int retval; int retval;
...@@ -3814,7 +3814,7 @@ static inline void ms_rw_fail(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -3814,7 +3814,7 @@ static inline void ms_rw_fail(struct scsi_cmnd *srb, struct rtsx_chip *chip)
static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
u32 start_sector, u16 sector_cnt) u32 start_sector, u16 sector_cnt)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
unsigned int lun = SCSI_LUN(srb); unsigned int lun = SCSI_LUN(srb);
int retval, seg_no; int retval, seg_no;
unsigned int index = 0, offset = 0; unsigned int index = 0, offset = 0;
...@@ -4075,7 +4075,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip, ...@@ -4075,7 +4075,7 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
u32 start_sector, u16 sector_cnt) u32 start_sector, u16 sector_cnt)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
if (CHK_MSPRO(ms_card)) if (CHK_MSPRO(ms_card))
...@@ -4091,7 +4091,7 @@ int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, ...@@ -4091,7 +4091,7 @@ int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
void ms_free_l2p_tbl(struct rtsx_chip *chip) void ms_free_l2p_tbl(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int i = 0; int i = 0;
if (ms_card->segment != NULL) { if (ms_card->segment != NULL) {
...@@ -4351,7 +4351,7 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -4351,7 +4351,7 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip)
int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip) int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
int bufflen; int bufflen;
int i; int i;
...@@ -4435,7 +4435,7 @@ int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -4435,7 +4435,7 @@ int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip) int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
int bufflen; int bufflen;
unsigned int lun = SCSI_LUN(srb); unsigned int lun = SCSI_LUN(srb);
...@@ -4495,7 +4495,7 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -4495,7 +4495,7 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
int mg_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip) int mg_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
int i; int i;
int bufflen; int bufflen;
...@@ -4547,7 +4547,7 @@ int mg_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -4547,7 +4547,7 @@ int mg_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip)
int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
int bufflen; int bufflen;
unsigned int lun = SCSI_LUN(srb); unsigned int lun = SCSI_LUN(srb);
...@@ -4604,7 +4604,7 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -4604,7 +4604,7 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &(chip->ms_card); struct ms_info *ms_card = &chip->ms_card;
int retval; int retval;
int bufflen; int bufflen;
#ifdef MG_SET_ICV_SLOW #ifdef MG_SET_ICV_SLOW
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7