p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: rts5208: ms.c: Parenthesis alignment 

Fix checkpatch messages: Alignment should match open parenthesis

Signed-off-by: Wayne Porter <wporter82@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Wayne Porter 2016-10-11 21:56:53 +00:00 committed by Greg Kroah-Hartman
parent 8473e5bb5c
commit 9c378f1488
1 changed files with 150 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/staging/rts5208/ms.c
View File

@ -1488,7 +1488,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,
} }
retval = ms_set_rw_reg_addr(chip, OverwriteFlag, retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
MS_EXTRA_SIZE, SystemParm, 6); MS_EXTRA_SIZE, SystemParm,
6);
if (retval != STATUS_SUCCESS) { if (retval != STATUS_SUCCESS) {
rtsx_trace(chip); rtsx_trace(chip);
return STATUS_FAIL; return STATUS_FAIL;
@ -1512,8 +1513,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int ms_write_extra_data(struct rtsx_chip *chip, static int ms_write_extra_data(struct rtsx_chip *chip, u16 block_addr,
u16 block_addr, u8 page_num, u8 *buf, int buf_len) 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;
@ -1981,20 +1982,24 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
if (uncorrect_flag) { if (uncorrect_flag) {
ms_set_page_status(log_blk, setPS_NG, ms_set_page_status(log_blk, setPS_NG,
extra, MS_EXTRA_SIZE); extra,
MS_EXTRA_SIZE);
if (i == 0) if (i == 0)
extra[0] &= 0xEF; extra[0] &= 0xEF;
ms_write_extra_data(chip, old_blk, i, ms_write_extra_data(chip, old_blk, i,
extra, MS_EXTRA_SIZE); extra,
MS_EXTRA_SIZE);
dev_dbg(rtsx_dev(chip), "page %d : extra[0] = 0x%x\n", dev_dbg(rtsx_dev(chip), "page %d : extra[0] = 0x%x\n",
i, extra[0]); i, extra[0]);
MS_SET_BAD_BLOCK_FLG(ms_card); MS_SET_BAD_BLOCK_FLG(ms_card);
ms_set_page_status(log_blk, setPS_Error, ms_set_page_status(log_blk, setPS_Error,
extra, MS_EXTRA_SIZE); extra,
MS_EXTRA_SIZE);
ms_write_extra_data(chip, new_blk, i, ms_write_extra_data(chip, new_blk, i,
extra, MS_EXTRA_SIZE); extra,
MS_EXTRA_SIZE);
continue; continue;
} }
@ -2021,8 +2026,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
} }
} }
retval = ms_set_rw_reg_addr(chip, OverwriteFlag, retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
MS_EXTRA_SIZE, SystemParm, (6 + MS_EXTRA_SIZE)); SystemParm, (6 + MS_EXTRA_SIZE));
ms_set_err_code(chip, MS_NO_ERROR); ms_set_err_code(chip, MS_NO_ERROR);
@ -2085,7 +2090,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
if (i == 0) { if (i == 0) {
retval = ms_set_rw_reg_addr(chip, OverwriteFlag, retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
MS_EXTRA_SIZE, SystemParm, 7); MS_EXTRA_SIZE, SystemParm,
7);
if (retval != STATUS_SUCCESS) { if (retval != STATUS_SUCCESS) {
rtsx_trace(chip); rtsx_trace(chip);
return STATUS_FAIL; return STATUS_FAIL;
@ -2774,7 +2780,8 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
phy_blk = ms_get_unused_block(chip, 0); phy_blk = ms_get_unused_block(chip, 0);
retval = ms_copy_page(chip, tmp_blk, phy_blk, retval = ms_copy_page(chip, tmp_blk, phy_blk,
log_blk, 0, ms_card->page_off + 1); log_blk, 0,
ms_card->page_off + 1);
if (retval != STATUS_SUCCESS) { if (retval != STATUS_SUCCESS) {
rtsx_trace(chip); rtsx_trace(chip);
return STATUS_FAIL; return STATUS_FAIL;
@ -3454,9 +3461,10 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
rtsx_send_cmd_no_wait(chip); rtsx_send_cmd_no_wait(chip);
retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr, retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr, 512,
512, scsi_sg_count(chip->srb), scsi_sg_count(chip->srb),
index, offset, DMA_FROM_DEVICE, index, offset,
DMA_FROM_DEVICE,
chip->ms_timeout); chip->ms_timeout);
if (retval < 0) { if (retval < 0) {
if (retval == -ETIMEDOUT) { if (retval == -ETIMEDOUT) {
@ -3645,9 +3653,10 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
rtsx_send_cmd_no_wait(chip); rtsx_send_cmd_no_wait(chip);
retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr, retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr, 512,
512, scsi_sg_count(chip->srb), scsi_sg_count(chip->srb),
index, offset, DMA_TO_DEVICE, index, offset,
DMA_TO_DEVICE,
chip->ms_timeout); chip->ms_timeout);
if (retval < 0) { if (retval < 0) {
ms_set_err_code(chip, MS_TO_ERROR); ms_set_err_code(chip, MS_TO_ERROR);
@ -3848,7 +3857,8 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
delay_write->delay_write_flag = 0; delay_write->delay_write_flag = 0;
retval = ms_copy_page(chip, retval = ms_copy_page(chip,
delay_write->old_phyblock, delay_write->old_phyblock,
delay_write->new_phyblock, log_blk, delay_write->new_phyblock,
log_blk,
delay_write->pageoff, start_page); delay_write->pageoff, start_page);
if (retval != STATUS_SUCCESS) { if (retval != STATUS_SUCCESS) {
set_sense_type(chip, lun, set_sense_type(chip, lun,
@ -3942,12 +3952,14 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
if (srb->sc_data_direction == DMA_FROM_DEVICE) { if (srb->sc_data_direction == DMA_FROM_DEVICE) {
retval = ms_read_multiple_pages(chip, retval = ms_read_multiple_pages(chip,
old_blk, log_blk, start_page, end_page, old_blk, log_blk,
start_page, end_page,
ptr, &index, &offset); ptr, &index, &offset);
} else { } else {
retval = ms_write_multiple_pages(chip, old_blk, retval = ms_write_multiple_pages(chip, old_blk, new_blk,
new_blk, log_blk, start_page, end_page, log_blk, start_page,
ptr, &index, &offset); end_page, ptr, &index,
&offset);
} }
if (retval != STATUS_SUCCESS) { if (retval != STATUS_SUCCESS) {