forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c 
 kernel/drivers/staging/rts5208/ms.c
....@@ -1,19 +1,8 @@
1
-/* Driver for Realtek PCI-Express card reader
1
+// SPDX-License-Identifier: GPL-2.0+
2
+/*
3
+ * Driver for Realtek PCI-Express card reader
24  *
35  * Copyright(c) 2009-2013 Realtek Semiconductor Corp. All rights reserved.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of the GNU General Public License as published by the
7
- * Free Software Foundation; either version 2, or (at your option) any
8
- * later version.
9
- *
10
- * This program is distributed in the hope that it will be useful, but
11
- * WITHOUT ANY WARRANTY; without even the implied warranty of
12
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
- * General Public License for more details.
14
- *
15
- * You should have received a copy of the GNU General Public License along
16
- * with this program; if not, see <http://www.gnu.org/licenses/>.
176  *
187  * Author:
198  *   Wei WANG (wei_wang@realsil.com.cn)
....@@ -111,9 +100,8 @@
111100 	u8 val, err_code = 0;
112101 	enum dma_data_direction dir;
113102 
114
-	if (!buf || !buf_len) {
103
+	if (!buf || !buf_len)
115104 		return STATUS_FAIL;
116
-	}
117105 
118106 	if (trans_mode == MS_TM_AUTO_READ) {
119107 		dir = DMA_FROM_DEVICE;
....@@ -162,12 +150,11 @@
162150 	}
163151 
164152 	retval = rtsx_read_register(chip, MS_TRANS_CFG, &val);
165
-	if (retval) {
153
+	if (retval)
166154 		return retval;
167
-	}
168
-	if (val & (MS_INT_CMDNK | MS_INT_ERR | MS_CRC16_ERR | MS_RDY_TIMEOUT)) {
155
+
156
+	if (val & (MS_INT_CMDNK | MS_INT_ERR | MS_CRC16_ERR | MS_RDY_TIMEOUT))
169157 		return STATUS_FAIL;
170
-	}
171158 
172159 	return STATUS_SUCCESS;
173160 }
....@@ -178,9 +165,8 @@
178165 	struct ms_info *ms_card = &chip->ms_card;
179166 	int retval, i;
180167 
181
-	if (!data || (data_len < cnt)) {
168
+	if (!data || (data_len < cnt))
182169 		return STATUS_ERROR;
183
-	}
184170 
185171 	rtsx_init_cmd(chip);
186172 
....@@ -244,9 +230,8 @@
244230 	int retval, i;
245231 	u8 *ptr;
246232 
247
-	if (!data) {
233
+	if (!data)
248234 		return STATUS_ERROR;
249
-	}
250235 
251236 	rtsx_init_cmd(chip);
252237 
....@@ -371,14 +356,12 @@
371356 	}
372357 
373358 	retval = switch_clock(chip, ms_card->ms_clock);
374
-	if (retval != STATUS_SUCCESS) {
359
+	if (retval != STATUS_SUCCESS)
375360 		return STATUS_FAIL;
376
-	}
377361 
378362 	retval = select_card(chip, MS_CARD);
379
-	if (retval != STATUS_SUCCESS) {
363
+	if (retval != STATUS_SUCCESS)
380364 		return STATUS_FAIL;
381
-	}
382365 
383366 	return STATUS_SUCCESS;
384367 }
....@@ -389,14 +372,12 @@
389372 	int retval;
390373 
391374 	retval = select_card(chip, MS_CARD);
392
-	if (retval != STATUS_SUCCESS) {
375
+	if (retval != STATUS_SUCCESS)
393376 		return STATUS_FAIL;
394
-	}
395377 
396378 	retval = switch_clock(chip, ms_card->ms_clock);
397
-	if (retval != STATUS_SUCCESS) {
379
+	if (retval != STATUS_SUCCESS)
398380 		return STATUS_FAIL;
399
-	}
400381 
401382 	return STATUS_SUCCESS;
402383 }
....@@ -409,60 +390,59 @@
409390 		retval = rtsx_write_register(chip, CARD_PULL_CTL1, 0xFF,
410391 					     MS_D1_PD | MS_D2_PD | MS_CLK_PD |
411392 					     MS_D6_PD);
412
-		if (retval) {
393
+		if (retval)
413394 			return retval;
414
-		}
395
+
415396 		retval = rtsx_write_register(chip, CARD_PULL_CTL2, 0xFF,
416397 					     MS_D3_PD | MS_D0_PD | MS_BS_PD |
417398 					     XD_D4_PD);
418
-		if (retval) {
399
+		if (retval)
419400 			return retval;
420
-		}
401
+
421402 		retval = rtsx_write_register(chip, CARD_PULL_CTL3, 0xFF,
422403 					     MS_D7_PD | XD_CE_PD | XD_CLE_PD |
423404 					     XD_CD_PU);
424
-		if (retval) {
405
+		if (retval)
425406 			return retval;
426
-		}
407
+
427408 		retval = rtsx_write_register(chip, CARD_PULL_CTL4, 0xFF,
428409 					     XD_RDY_PD | SD_D3_PD | SD_D2_PD |
429410 					     XD_ALE_PD);
430
-		if (retval) {
411
+		if (retval)
431412 			return retval;
432
-		}
413
+
433414 		retval = rtsx_write_register(chip, CARD_PULL_CTL5, 0xFF,
434415 					     MS_INS_PU | SD_WP_PD | SD_CD_PU |
435416 					     SD_CMD_PD);
436
-		if (retval) {
417
+		if (retval)
437418 			return retval;
438
-		}
419
+
439420 		retval = rtsx_write_register(chip, CARD_PULL_CTL6, 0xFF,
440421 					     MS_D5_PD | MS_D4_PD);
441
-		if (retval) {
422
+		if (retval)
442423 			return retval;
443
-		}
424
+
444425 	} else if (CHECK_PID(chip, 0x5288)) {
445426 		if (CHECK_BARO_PKG(chip, QFN)) {
446427 			retval = rtsx_write_register(chip, CARD_PULL_CTL1,
447428 						     0xFF, 0x55);
448
-			if (retval) {
429
+			if (retval)
449430 				return retval;
450
-			}
431
+
451432 			retval = rtsx_write_register(chip, CARD_PULL_CTL2,
452433 						     0xFF, 0x55);
453
-			if (retval) {
434
+			if (retval)
454435 				return retval;
455
-			}
436
+
456437 			retval = rtsx_write_register(chip, CARD_PULL_CTL3,
457438 						     0xFF, 0x4B);
458
-			if (retval) {
439
+			if (retval)
459440 				return retval;
460
-			}
441
+
461442 			retval = rtsx_write_register(chip, CARD_PULL_CTL4,
462443 						     0xFF, 0x69);
463
-			if (retval) {
444
+			if (retval)
464445 				return retval;
465
-			}
466446 		}
467447 	}
468448 
....@@ -502,9 +482,8 @@
502482 	}
503483 
504484 	retval = rtsx_send_cmd(chip, MS_CARD, 100);
505
-	if (retval < 0) {
485
+	if (retval < 0)
506486 		return STATUS_FAIL;
507
-	}
508487 
509488 	return STATUS_SUCCESS;
510489 }
....@@ -523,36 +502,31 @@
523502 	ms_card->pro_under_formatting = 0;
524503 
525504 	retval = ms_power_off_card3v3(chip);
526
-	if (retval != STATUS_SUCCESS) {
505
+	if (retval != STATUS_SUCCESS)
527506 		return STATUS_FAIL;
528
-	}
529507 
530508 	if (!chip->ft2_fast_mode)
531509 		wait_timeout(250);
532510 
533511 	retval = enable_card_clock(chip, MS_CARD);
534
-	if (retval != STATUS_SUCCESS) {
512
+	if (retval != STATUS_SUCCESS)
535513 		return STATUS_FAIL;
536
-	}
537514 
538515 	if (chip->asic_code) {
539516 		retval = ms_pull_ctl_enable(chip);
540
-		if (retval != STATUS_SUCCESS) {
517
+		if (retval != STATUS_SUCCESS)
541518 			return STATUS_FAIL;
542
-		}
543519 	} else {
544520 		retval = rtsx_write_register(chip, FPGA_PULL_CTL,
545521 					     FPGA_MS_PULL_CTL_BIT | 0x20, 0);
546
-		if (retval) {
522
+		if (retval)
547523 			return retval;
548
-		}
549524 	}
550525 
551526 	if (!chip->ft2_fast_mode) {
552527 		retval = card_power_on(chip, MS_CARD);
553
-		if (retval != STATUS_SUCCESS) {
528
+		if (retval != STATUS_SUCCESS)
554529 			return STATUS_FAIL;
555
-		}
556530 
557531 		wait_timeout(150);
558532 
....@@ -572,9 +546,8 @@
572546 
573547 	retval = rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN,
574548 				     MS_OUTPUT_EN);
575
-	if (retval) {
549
+	if (retval)
576550 		return retval;
577
-	}
578551 
579552 	if (chip->asic_code) {
580553 		retval = rtsx_write_register(chip, MS_CFG, 0xFF,
....@@ -582,34 +555,31 @@
582555 					     PUSH_TIME_DEFAULT |
583556 					     NO_EXTEND_TOGGLE |
584557 					     MS_BUS_WIDTH_1);
585
-		if (retval) {
558
+		if (retval)
586559 			return retval;
587
-		}
560
+
588561 	} else {
589562 		retval = rtsx_write_register(chip, MS_CFG, 0xFF,
590563 					     SAMPLE_TIME_FALLING |
591564 					     PUSH_TIME_DEFAULT |
592565 					     NO_EXTEND_TOGGLE |
593566 					     MS_BUS_WIDTH_1);
594
-		if (retval) {
567
+		if (retval)
595568 			return retval;
596
-		}
597569 	}
598570 	retval = rtsx_write_register(chip, MS_TRANS_CFG, 0xFF,
599571 				     NO_WAIT_INT | NO_AUTO_READ_INT_REG);
600
-	if (retval) {
572
+	if (retval)
601573 		return retval;
602
-	}
574
+
603575 	retval = rtsx_write_register(chip, CARD_STOP, MS_STOP | MS_CLR_ERR,
604576 				     MS_STOP | MS_CLR_ERR);
605
-	if (retval) {
577
+	if (retval)
606578 		return retval;
607
-	}
608579 
609580 	retval = ms_set_init_para(chip);
610
-	if (retval != STATUS_SUCCESS) {
581
+	if (retval != STATUS_SUCCESS)
611582 		return STATUS_FAIL;
612
-	}
613583 
614584 	return STATUS_SUCCESS;
615585 }
....@@ -620,10 +590,9 @@
620590 	int retval, i;
621591 	u8 val;
622592 
623
-	retval = ms_set_rw_reg_addr(chip, Pro_StatusReg, 6, SystemParm, 1);
624
-	if (retval != STATUS_SUCCESS) {
593
+	retval = ms_set_rw_reg_addr(chip, PRO_STATUS_REG, 6, SYSTEM_PARAM, 1);
594
+	if (retval != STATUS_SUCCESS)
625595 		return STATUS_FAIL;
626
-	}
627596 
628597 	for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
629598 		retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, READ_REG,
....@@ -631,14 +600,13 @@
631600 		if (retval == STATUS_SUCCESS)
632601 			break;
633602 	}
634
-	if (i == MS_MAX_RETRY_COUNT) {
603
+	if (i == MS_MAX_RETRY_COUNT)
635604 		return STATUS_FAIL;
636
-	}
637605 
638606 	retval = rtsx_read_register(chip, PPBUF_BASE2 + 2, &val);
639
-	if (retval) {
607
+	if (retval)
640608 		return retval;
641
-	}
609
+
642610 	dev_dbg(rtsx_dev(chip), "Type register: 0x%x\n", val);
643611 	if (val != 0x01) {
644612 		if (val != 0x02)
....@@ -648,9 +616,9 @@
648616 	}
649617 
650618 	retval = rtsx_read_register(chip, PPBUF_BASE2 + 4, &val);
651
-	if (retval) {
619
+	if (retval)
652620 		return retval;
653
-	}
621
+
654622 	dev_dbg(rtsx_dev(chip), "Category register: 0x%x\n", val);
655623 	if (val != 0) {
656624 		ms_card->check_ms_flow = 1;
....@@ -658,15 +626,15 @@
658626 	}
659627 
660628 	retval = rtsx_read_register(chip, PPBUF_BASE2 + 5, &val);
661
-	if (retval) {
629
+	if (retval)
662630 		return retval;
663
-	}
631
+
664632 	dev_dbg(rtsx_dev(chip), "Class register: 0x%x\n", val);
665633 	if (val == 0) {
666634 		retval = rtsx_read_register(chip, PPBUF_BASE2, &val);
667
-		if (retval) {
635
+		if (retval)
668636 			return retval;
669
-		}
637
+
670638 		if (val & WRT_PRTCT)
671639 			chip->card_wp |= MS_CARD;
672640 		else
....@@ -682,9 +650,9 @@
682650 	ms_card->ms_type |= TYPE_MSPRO;
683651 
684652 	retval = rtsx_read_register(chip, PPBUF_BASE2 + 3, &val);
685
-	if (retval) {
653
+	if (retval)
686654 		return retval;
687
-	}
655
+
688656 	dev_dbg(rtsx_dev(chip), "IF Mode register: 0x%x\n", val);
689657 	if (val == 0) {
690658 		ms_card->ms_type &= 0x0F;
....@@ -720,13 +688,11 @@
720688 			if (retval == STATUS_SUCCESS)
721689 				break;
722690 		}
723
-		if (i == MS_MAX_RETRY_COUNT) {
691
+		if (i == MS_MAX_RETRY_COUNT)
724692 			return STATUS_FAIL;
725
-		}
726693 
727
-		if (k > 100) {
694
+		if (k > 100)
728695 			return STATUS_FAIL;
729
-		}
730696 
731697 		k++;
732698 		wait_timeout(100);
....@@ -737,16 +703,14 @@
737703 		if (retval == STATUS_SUCCESS)
738704 			break;
739705 	}
740
-	if (i == MS_MAX_RETRY_COUNT) {
706
+	if (i == MS_MAX_RETRY_COUNT)
741707 		return STATUS_FAIL;
742
-	}
743708 
744709 	if (val & INT_REG_ERR) {
745
-		if (val & INT_REG_CMDNK) {
710
+		if (val & INT_REG_CMDNK)
746711 			chip->card_wp |= (MS_CARD);
747
-		} else {
712
+		else
748713 			return STATUS_FAIL;
749
-		}
750714 	}
751715 	/* --  end confirm CPU startup */
752716 
....@@ -766,9 +730,8 @@
766730 		if (retval == STATUS_SUCCESS)
767731 			break;
768732 	}
769
-	if (retval != STATUS_SUCCESS) {
733
+	if (retval != STATUS_SUCCESS)
770734 		return STATUS_FAIL;
771
-	}
772735 
773736 	return STATUS_SUCCESS;
774737 }
....@@ -787,27 +750,24 @@
787750 		if (retval == STATUS_SUCCESS)
788751 			break;
789752 	}
790
-	if (retval != STATUS_SUCCESS) {
753
+	if (retval != STATUS_SUCCESS)
791754 		return STATUS_FAIL;
792
-	}
793755 
794756 	retval = rtsx_write_register(chip, MS_CFG, 0x98,
795757 				     MS_BUS_WIDTH_8 | SAMPLE_TIME_FALLING);
796
-	if (retval) {
758
+	if (retval)
797759 		return retval;
798
-	}
760
+
799761 	ms_card->ms_type |= MS_8BIT;
800762 	retval = ms_set_init_para(chip);
801
-	if (retval != STATUS_SUCCESS) {
763
+	if (retval != STATUS_SUCCESS)
802764 		return STATUS_FAIL;
803
-	}
804765 
805766 	for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
806767 		retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, GET_INT,
807768 					 1, NO_WAIT_INT);
808
-		if (retval != STATUS_SUCCESS) {
769
+		if (retval != STATUS_SUCCESS)
809770 			return STATUS_FAIL;
810
-		}
811771 	}
812772 
813773 	return STATUS_SUCCESS;
....@@ -820,19 +780,16 @@
820780 
821781 	for (i = 0; i < 3; i++) {
822782 		retval = ms_prepare_reset(chip);
823
-		if (retval != STATUS_SUCCESS) {
783
+		if (retval != STATUS_SUCCESS)
824784 			return STATUS_FAIL;
825
-		}
826785 
827786 		retval = ms_identify_media_type(chip, switch_8bit_bus);
828
-		if (retval != STATUS_SUCCESS) {
787
+		if (retval != STATUS_SUCCESS)
829788 			return STATUS_FAIL;
830
-		}
831789 
832790 		retval = ms_confirm_cpu_startup(chip);
833
-		if (retval != STATUS_SUCCESS) {
791
+		if (retval != STATUS_SUCCESS)
834792 			return STATUS_FAIL;
835
-		}
836793 
837794 		retval = ms_switch_parallel_bus(chip);
838795 		if (retval != STATUS_SUCCESS) {
....@@ -846,25 +803,22 @@
846803 		}
847804 	}
848805 
849
-	if (retval != STATUS_SUCCESS) {
806
+	if (retval != STATUS_SUCCESS)
850807 		return STATUS_FAIL;
851
-	}
852808 
853809 	/* Switch MS-PRO into Parallel mode */
854810 	retval = rtsx_write_register(chip, MS_CFG, 0x18, MS_BUS_WIDTH_4);
855
-	if (retval) {
811
+	if (retval)
856812 		return retval;
857
-	}
813
+
858814 	retval = rtsx_write_register(chip, MS_CFG, PUSH_TIME_ODD,
859815 				     PUSH_TIME_ODD);
860
-	if (retval) {
816
+	if (retval)
861817 		return retval;
862
-	}
863818 
864819 	retval = ms_set_init_para(chip);
865
-	if (retval != STATUS_SUCCESS) {
820
+	if (retval != STATUS_SUCCESS)
866821 		return STATUS_FAIL;
867
-	}
868822 
869823 	/* If MSPro HG Card, We shall try to switch to 8-bit bus */
870824 	if (CHK_MSHG(ms_card) && chip->support_ms_8bit && switch_8bit_bus) {
....@@ -886,10 +840,9 @@
886840 
887841 	ms_cleanup_work(chip);
888842 
889
-	retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_DataCount1, 6);
890
-	if (retval != STATUS_SUCCESS) {
843
+	retval = ms_set_rw_reg_addr(chip, 0, 0, PRO_DATA_COUNT1, 6);
844
+	if (retval != STATUS_SUCCESS)
891845 		return STATUS_FAIL;
892
-	}
893846 
894847 	buf[0] = 0;
895848 	buf[1] = mode;
....@@ -899,22 +852,19 @@
899852 	buf[5] = 0;
900853 
901854 	retval = ms_write_bytes(chip, PRO_WRITE_REG, 6, NO_WAIT_INT, buf, 6);
902
-	if (retval != STATUS_SUCCESS) {
855
+	if (retval != STATUS_SUCCESS)
903856 		return STATUS_FAIL;
904
-	}
905857 
906858 	retval = ms_send_cmd(chip, XC_CHG_POWER, WAIT_INT);
907
-	if (retval != STATUS_SUCCESS) {
859
+	if (retval != STATUS_SUCCESS)
908860 		return STATUS_FAIL;
909
-	}
910861 
911862 	retval = rtsx_read_register(chip, MS_TRANS_CFG, buf);
912
-	if (retval) {
863
+	if (retval)
913864 		return retval;
914
-	}
915
-	if (buf[0] & (MS_INT_CMDNK | MS_INT_ERR)) {
865
+
866
+	if (buf[0] & (MS_INT_CMDNK | MS_INT_ERR))
916867 		return STATUS_FAIL;
917
-	}
918868 
919869 	return STATUS_SUCCESS;
920870 }
....@@ -935,10 +885,9 @@
935885 	int found_sys_info = 0, found_model_name = 0;
936886 #endif
937887 
938
-	retval = ms_set_rw_reg_addr(chip, Pro_IntReg, 2, Pro_SystemParm, 7);
939
-	if (retval != STATUS_SUCCESS) {
888
+	retval = ms_set_rw_reg_addr(chip, PRO_INT_REG, 2, PRO_SYSTEM_PARAM, 7);
889
+	if (retval != STATUS_SUCCESS)
940890 		return STATUS_FAIL;
941
-	}
942891 
943892 	if (CHK_MS8BIT(ms_card))
944893 		data[0] = PARALLEL_8BIT_IF;
....@@ -960,14 +909,12 @@
960909 		if (retval == STATUS_SUCCESS)
961910 			break;
962911 	}
963
-	if (retval != STATUS_SUCCESS) {
912
+	if (retval != STATUS_SUCCESS)
964913 		return STATUS_FAIL;
965
-	}
966914 
967915 	buf = kmalloc(64 * 512, GFP_KERNEL);
968
-	if (!buf) {
916
+	if (!buf)
969917 		return STATUS_ERROR;
970
-	}
971918 
972919 	for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
973920 		retval = ms_send_cmd(chip, PRO_READ_ATRB, WAIT_INT);
....@@ -1150,18 +1097,15 @@
11501097 
11511098 #ifdef SUPPORT_MSXC
11521099 	if (CHK_MSXC(ms_card)) {
1153
-		if (class_code != 0x03) {
1100
+		if (class_code != 0x03)
11541101 			return STATUS_FAIL;
1155
-		}
11561102 	} else {
1157
-		if (class_code != 0x02) {
1103
+		if (class_code != 0x02)
11581104 			return STATUS_FAIL;
1159
-		}
11601105 	}
11611106 #else
1162
-	if (class_code != 0x02) {
1107
+	if (class_code != 0x02)
11631108 		return STATUS_FAIL;
1164
-	}
11651109 #endif
11661110 
11671111 	if (device_type != 0x00) {
....@@ -1173,9 +1117,8 @@
11731117 		}
11741118 	}
11751119 
1176
-	if (sub_class & 0xC0) {
1120
+	if (sub_class & 0xC0)
11771121 		return STATUS_FAIL;
1178
-	}
11791122 
11801123 	dev_dbg(rtsx_dev(chip), "class_code: 0x%x, device_type: 0x%x, sub_class: 0x%x\n",
11811124 		class_code, device_type, sub_class);
....@@ -1223,18 +1166,16 @@
12231166 	if (retval != STATUS_SUCCESS) {
12241167 		if (ms_card->switch_8bit_fail) {
12251168 			retval = ms_pro_reset_flow(chip, 0);
1226
-			if (retval != STATUS_SUCCESS) {
1169
+			if (retval != STATUS_SUCCESS)
12271170 				return STATUS_FAIL;
1228
-			}
12291171 		} else {
12301172 			return STATUS_FAIL;
12311173 		}
12321174 	}
12331175 
12341176 	retval = ms_read_attribute_info(chip);
1235
-	if (retval != STATUS_SUCCESS) {
1177
+	if (retval != STATUS_SUCCESS)
12361178 		return STATUS_FAIL;
1237
-	}
12381179 
12391180 #ifdef XC_POWERCLASS
12401181 	if (CHK_HG8BIT(ms_card))
....@@ -1274,9 +1215,8 @@
12741215 
12751216 #ifdef SUPPORT_MAGIC_GATE
12761217 	retval = mg_set_tpc_para_sub(chip, 0, 0);
1277
-	if (retval != STATUS_SUCCESS) {
1218
+	if (retval != STATUS_SUCCESS)
12781219 		return STATUS_FAIL;
1279
-	}
12801220 #endif
12811221 
12821222 	if (CHK_HG8BIT(ms_card))
....@@ -1292,15 +1232,13 @@
12921232 	int retval;
12931233 	u8 val[2];
12941234 
1295
-	retval = ms_set_rw_reg_addr(chip, StatusReg0, 2, 0, 0);
1296
-	if (retval != STATUS_SUCCESS) {
1235
+	retval = ms_set_rw_reg_addr(chip, STATUS_REG0, 2, 0, 0);
1236
+	if (retval != STATUS_SUCCESS)
12971237 		return STATUS_FAIL;
1298
-	}
12991238 
13001239 	retval = ms_read_bytes(chip, READ_REG, 2, NO_WAIT_INT, val, 2);
1301
-	if (retval != STATUS_SUCCESS) {
1240
+	if (retval != STATUS_SUCCESS)
13021241 		return STATUS_FAIL;
1303
-	}
13041242 
13051243 	if (val[1] & (STS_UCDT | STS_UCEX | STS_UCFG)) {
13061244 		ms_set_err_code(chip, MS_FLASH_READ_ERROR);
....@@ -1317,11 +1255,10 @@
13171255 	int retval, i;
13181256 	u8 val, data[10];
13191257 
1320
-	retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
1321
-				    SystemParm, 6);
1322
-	if (retval != STATUS_SUCCESS) {
1258
+	retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
1259
+				    SYSTEM_PARAM, 6);
1260
+	if (retval != STATUS_SUCCESS)
13231261 		return STATUS_FAIL;
1324
-	}
13251262 
13261263 	if (CHK_MS4BIT(ms_card)) {
13271264 		/* Parallel interface */
....@@ -1342,9 +1279,8 @@
13421279 		if (retval == STATUS_SUCCESS)
13431280 			break;
13441281 	}
1345
-	if (i == MS_MAX_RETRY_COUNT) {
1282
+	if (i == MS_MAX_RETRY_COUNT)
13461283 		return STATUS_FAIL;
1347
-	}
13481284 
13491285 	ms_set_err_code(chip, MS_NO_ERROR);
13501286 
....@@ -1353,15 +1289,13 @@
13531289 		if (retval == STATUS_SUCCESS)
13541290 			break;
13551291 	}
1356
-	if (i == MS_MAX_RETRY_COUNT) {
1292
+	if (i == MS_MAX_RETRY_COUNT)
13571293 		return STATUS_FAIL;
1358
-	}
13591294 
13601295 	ms_set_err_code(chip, MS_NO_ERROR);
13611296 	retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
1362
-	if (retval != STATUS_SUCCESS) {
1297
+	if (retval != STATUS_SUCCESS)
13631298 		return STATUS_FAIL;
1364
-	}
13651299 
13661300 	if (val & INT_REG_CMDNK) {
13671301 		ms_set_err_code(chip, MS_CMD_NK);
....@@ -1370,24 +1304,21 @@
13701304 	if (val & INT_REG_CED) {
13711305 		if (val & INT_REG_ERR) {
13721306 			retval = ms_read_status_reg(chip);
1373
-			if (retval != STATUS_SUCCESS) {
1307
+			if (retval != STATUS_SUCCESS)
13741308 				return STATUS_FAIL;
1375
-			}
13761309 
1377
-			retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
1378
-						    MS_EXTRA_SIZE, SystemParm,
1310
+			retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG,
1311
+						    MS_EXTRA_SIZE, SYSTEM_PARAM,
13791312 						    6);
1380
-			if (retval != STATUS_SUCCESS) {
1313
+			if (retval != STATUS_SUCCESS)
13811314 				return STATUS_FAIL;
1382
-			}
13831315 		}
13841316 	}
13851317 
13861318 	retval = ms_read_bytes(chip, READ_REG, MS_EXTRA_SIZE, NO_WAIT_INT,
13871319 			       data, MS_EXTRA_SIZE);
1388
-	if (retval != STATUS_SUCCESS) {
1320
+	if (retval != STATUS_SUCCESS)
13891321 		return STATUS_FAIL;
1390
-	}
13911322 
13921323 	if (buf && buf_len) {
13931324 		if (buf_len > MS_EXTRA_SIZE)
....@@ -1405,15 +1336,13 @@
14051336 	int retval, i;
14061337 	u8 val, data[16];
14071338 
1408
-	if (!buf || (buf_len < MS_EXTRA_SIZE)) {
1339
+	if (!buf || (buf_len < MS_EXTRA_SIZE))
14091340 		return STATUS_FAIL;
1410
-	}
14111341 
1412
-	retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
1413
-				    SystemParm, 6 + MS_EXTRA_SIZE);
1414
-	if (retval != STATUS_SUCCESS) {
1342
+	retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
1343
+				    SYSTEM_PARAM, 6 + MS_EXTRA_SIZE);
1344
+	if (retval != STATUS_SUCCESS)
14151345 		return STATUS_FAIL;
1416
-	}
14171346 
14181347 	if (CHK_MS4BIT(ms_card))
14191348 		data[0] = 0x88;
....@@ -1431,20 +1360,17 @@
14311360 
14321361 	retval = ms_write_bytes(chip, WRITE_REG, (6 + MS_EXTRA_SIZE),
14331362 				NO_WAIT_INT, data, 16);
1434
-	if (retval != STATUS_SUCCESS) {
1363
+	if (retval != STATUS_SUCCESS)
14351364 		return STATUS_FAIL;
1436
-	}
14371365 
14381366 	retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
1439
-	if (retval != STATUS_SUCCESS) {
1367
+	if (retval != STATUS_SUCCESS)
14401368 		return STATUS_FAIL;
1441
-	}
14421369 
14431370 	ms_set_err_code(chip, MS_NO_ERROR);
14441371 	retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
1445
-	if (retval != STATUS_SUCCESS) {
1372
+	if (retval != STATUS_SUCCESS)
14461373 		return STATUS_FAIL;
1447
-	}
14481374 
14491375 	if (val & INT_REG_CMDNK) {
14501376 		ms_set_err_code(chip, MS_CMD_NK);
....@@ -1466,11 +1392,10 @@
14661392 	int retval;
14671393 	u8 val, data[6];
14681394 
1469
-	retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
1470
-				    SystemParm, 6);
1471
-	if (retval != STATUS_SUCCESS) {
1395
+	retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
1396
+				    SYSTEM_PARAM, 6);
1397
+	if (retval != STATUS_SUCCESS)
14721398 		return STATUS_FAIL;
1473
-	}
14741399 
14751400 	if (CHK_MS4BIT(ms_card))
14761401 		data[0] = 0x88;
....@@ -1484,20 +1409,17 @@
14841409 	data[5] = page_num;
14851410 
14861411 	retval = ms_write_bytes(chip, WRITE_REG, 6, NO_WAIT_INT, data, 6);
1487
-	if (retval != STATUS_SUCCESS) {
1412
+	if (retval != STATUS_SUCCESS)
14881413 		return STATUS_FAIL;
1489
-	}
14901414 
14911415 	retval = ms_send_cmd(chip, BLOCK_READ, WAIT_INT);
1492
-	if (retval != STATUS_SUCCESS) {
1416
+	if (retval != STATUS_SUCCESS)
14931417 		return STATUS_FAIL;
1494
-	}
14951418 
14961419 	ms_set_err_code(chip, MS_NO_ERROR);
14971420 	retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
1498
-	if (retval != STATUS_SUCCESS) {
1421
+	if (retval != STATUS_SUCCESS)
14991422 		return STATUS_FAIL;
1500
-	}
15011423 
15021424 	if (val & INT_REG_CMDNK) {
15031425 		ms_set_err_code(chip, MS_CMD_NK);
....@@ -1524,13 +1446,11 @@
15241446 
15251447 	retval = ms_transfer_tpc(chip, MS_TM_NORMAL_READ, READ_PAGE_DATA,
15261448 				 0, NO_WAIT_INT);
1527
-	if (retval != STATUS_SUCCESS) {
1449
+	if (retval != STATUS_SUCCESS)
15281450 		return STATUS_FAIL;
1529
-	}
15301451 
1531
-	if (ms_check_err_code(chip, MS_FLASH_WRITE_ERROR)) {
1452
+	if (ms_check_err_code(chip, MS_FLASH_WRITE_ERROR))
15321453 		return STATUS_FAIL;
1533
-	}
15341454 
15351455 	return STATUS_SUCCESS;
15361456 }
....@@ -1542,15 +1462,13 @@
15421462 	u8 val, data[8], extra[MS_EXTRA_SIZE];
15431463 
15441464 	retval = ms_read_extra_data(chip, phy_blk, 0, extra, MS_EXTRA_SIZE);
1545
-	if (retval != STATUS_SUCCESS) {
1465
+	if (retval != STATUS_SUCCESS)
15461466 		return STATUS_FAIL;
1547
-	}
15481467 
1549
-	retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
1550
-				    SystemParm, 7);
1551
-	if (retval != STATUS_SUCCESS) {
1468
+	retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
1469
+				    SYSTEM_PARAM, 7);
1470
+	if (retval != STATUS_SUCCESS)
15521471 		return STATUS_FAIL;
1553
-	}
15541472 
15551473 	ms_set_err_code(chip, MS_NO_ERROR);
15561474 
....@@ -1568,20 +1486,17 @@
15681486 	data[7] = 0xFF;
15691487 
15701488 	retval = ms_write_bytes(chip, WRITE_REG, 7, NO_WAIT_INT, data, 7);
1571
-	if (retval != STATUS_SUCCESS) {
1489
+	if (retval != STATUS_SUCCESS)
15721490 		return STATUS_FAIL;
1573
-	}
15741491 
15751492 	retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
1576
-	if (retval != STATUS_SUCCESS) {
1493
+	if (retval != STATUS_SUCCESS)
15771494 		return STATUS_FAIL;
1578
-	}
15791495 
15801496 	ms_set_err_code(chip, MS_NO_ERROR);
15811497 	retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
1582
-	if (retval != STATUS_SUCCESS) {
1498
+	if (retval != STATUS_SUCCESS)
15831499 		return STATUS_FAIL;
1584
-	}
15851500 
15861501 	if (val & INT_REG_CMDNK) {
15871502 		ms_set_err_code(chip, MS_CMD_NK);
....@@ -1604,11 +1519,10 @@
16041519 	int retval, i = 0;
16051520 	u8 val, data[6];
16061521 
1607
-	retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
1608
-				    SystemParm, 6);
1609
-	if (retval != STATUS_SUCCESS) {
1522
+	retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
1523
+				    SYSTEM_PARAM, 6);
1524
+	if (retval != STATUS_SUCCESS)
16101525 		return STATUS_FAIL;
1611
-	}
16121526 
16131527 	ms_set_err_code(chip, MS_NO_ERROR);
16141528 
....@@ -1624,21 +1538,18 @@
16241538 	data[5] = 0;
16251539 
16261540 	retval = ms_write_bytes(chip, WRITE_REG, 6, NO_WAIT_INT, data, 6);
1627
-	if (retval != STATUS_SUCCESS) {
1541
+	if (retval != STATUS_SUCCESS)
16281542 		return STATUS_FAIL;
1629
-	}
16301543 
16311544 ERASE_RTY:
16321545 	retval = ms_send_cmd(chip, BLOCK_ERASE, WAIT_INT);
1633
-	if (retval != STATUS_SUCCESS) {
1546
+	if (retval != STATUS_SUCCESS)
16341547 		return STATUS_FAIL;
1635
-	}
16361548 
16371549 	ms_set_err_code(chip, MS_NO_ERROR);
16381550 	retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
1639
-	if (retval != STATUS_SUCCESS) {
1551
+	if (retval != STATUS_SUCCESS)
16401552 		return STATUS_FAIL;
1641
-	}
16421553 
16431554 	if (val & INT_REG_CMDNK) {
16441555 		if (i < 3) {
....@@ -1668,7 +1579,7 @@
16681579 
16691580 	memset(extra, 0xFF, MS_EXTRA_SIZE);
16701581 
1671
-	if (type == setPS_NG) {
1582
+	if (type == set_PS_NG) {
16721583 		/* set page status as 1:NG,and block status keep 1:OK */
16731584 		extra[0] = 0xB8;
16741585 	} else {
....@@ -1701,9 +1612,8 @@
17011612 
17021613 		retval = ms_write_extra_data(chip, phy_blk, i,
17031614 					     extra, MS_EXTRA_SIZE);
1704
-		if (retval != STATUS_SUCCESS) {
1615
+		if (retval != STATUS_SUCCESS)
17051616 			return STATUS_FAIL;
1706
-		}
17071617 	}
17081618 
17091619 	return STATUS_SUCCESS;
....@@ -1723,30 +1633,25 @@
17231633 		start_page, end_page);
17241634 
17251635 	retval = ms_read_extra_data(chip, new_blk, 0, extra, MS_EXTRA_SIZE);
1726
-	if (retval != STATUS_SUCCESS) {
1636
+	if (retval != STATUS_SUCCESS)
17271637 		return STATUS_FAIL;
1728
-	}
17291638 
17301639 	retval = ms_read_status_reg(chip);
1731
-	if (retval != STATUS_SUCCESS) {
1640
+	if (retval != STATUS_SUCCESS)
17321641 		return STATUS_FAIL;
1733
-	}
17341642 
17351643 	retval = rtsx_read_register(chip, PPBUF_BASE2, &val);
1736
-	if (retval) {
1644
+	if (retval)
17371645 		return retval;
1738
-	}
17391646 
17401647 	if (val & BUF_FULL) {
17411648 		retval = ms_send_cmd(chip, CLEAR_BUF, WAIT_INT);
1742
-		if (retval != STATUS_SUCCESS) {
1649
+		if (retval != STATUS_SUCCESS)
17431650 			return STATUS_FAIL;
1744
-		}
17451651 
17461652 		retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
1747
-		if (retval != STATUS_SUCCESS) {
1653
+		if (retval != STATUS_SUCCESS)
17481654 			return STATUS_FAIL;
1749
-		}
17501655 
17511656 		if (!(val & INT_REG_CED)) {
17521657 			ms_set_err_code(chip, MS_FLASH_WRITE_ERROR);
....@@ -1760,13 +1665,15 @@
17601665 			return STATUS_FAIL;
17611666 		}
17621667 
1763
-		ms_read_extra_data(chip, old_blk, i, extra, MS_EXTRA_SIZE);
1764
-
1765
-		retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
1766
-					    MS_EXTRA_SIZE, SystemParm, 6);
1767
-		if (retval != STATUS_SUCCESS) {
1668
+		retval = ms_read_extra_data(chip, old_blk, i, extra,
1669
+					    MS_EXTRA_SIZE);
1670
+		if (retval != STATUS_SUCCESS)
17681671 			return STATUS_FAIL;
1769
-		}
1672
+
1673
+		retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG,
1674
+					    MS_EXTRA_SIZE, SYSTEM_PARAM, 6);
1675
+		if (retval != STATUS_SUCCESS)
1676
+			return STATUS_FAIL;
17701677 
17711678 		ms_set_err_code(chip, MS_NO_ERROR);
17721679 
....@@ -1783,20 +1690,17 @@
17831690 
17841691 		retval = ms_write_bytes(chip, WRITE_REG, 6, NO_WAIT_INT,
17851692 					data, 6);
1786
-		if (retval != STATUS_SUCCESS) {
1693
+		if (retval != STATUS_SUCCESS)
17871694 			return STATUS_FAIL;
1788
-		}
17891695 
17901696 		retval = ms_send_cmd(chip, BLOCK_READ, WAIT_INT);
1791
-		if (retval != STATUS_SUCCESS) {
1697
+		if (retval != STATUS_SUCCESS)
17921698 			return STATUS_FAIL;
1793
-		}
17941699 
17951700 		ms_set_err_code(chip, MS_NO_ERROR);
17961701 		retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
1797
-		if (retval != STATUS_SUCCESS) {
1702
+		if (retval != STATUS_SUCCESS)
17981703 			return STATUS_FAIL;
1799
-		}
18001704 
18011705 		if (val & INT_REG_CMDNK) {
18021706 			ms_set_err_code(chip, MS_CMD_NK);
....@@ -1817,12 +1721,11 @@
18171721 							 MS_TM_NORMAL_READ,
18181722 							 READ_PAGE_DATA,
18191723 							 0, NO_WAIT_INT);
1820
-				if (retval != STATUS_SUCCESS) {
1724
+				if (retval != STATUS_SUCCESS)
18211725 					return STATUS_FAIL;
1822
-				}
18231726 
18241727 				if (uncorrect_flag) {
1825
-					ms_set_page_status(log_blk, setPS_NG,
1728
+					ms_set_page_status(log_blk, set_PS_NG,
18261729 							   extra,
18271730 							   MS_EXTRA_SIZE);
18281731 					if (i == 0)
....@@ -1835,8 +1738,8 @@
18351738 						i, extra[0]);
18361739 					MS_SET_BAD_BLOCK_FLG(ms_card);
18371740 
1838
-					ms_set_page_status(log_blk, setPS_Error,
1839
-							   extra,
1741
+					ms_set_page_status(log_blk,
1742
+							   set_PS_error, extra,
18401743 							   MS_EXTRA_SIZE);
18411744 					ms_write_extra_data(chip, new_blk, i,
18421745 							    extra,
....@@ -1854,9 +1757,8 @@
18541757 					if (retval == STATUS_SUCCESS)
18551758 						break;
18561759 				}
1857
-				if (rty_cnt == MS_MAX_RETRY_COUNT) {
1760
+				if (rty_cnt == MS_MAX_RETRY_COUNT)
18581761 					return STATUS_FAIL;
1859
-				}
18601762 			}
18611763 
18621764 			if (!(val & INT_REG_BREQ)) {
....@@ -1865,8 +1767,8 @@
18651767 			}
18661768 		}
18671769 
1868
-		retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
1869
-					    SystemParm, (6 + MS_EXTRA_SIZE));
1770
+		retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
1771
+					    SYSTEM_PARAM, (6 + MS_EXTRA_SIZE));
18701772 
18711773 		ms_set_err_code(chip, MS_NO_ERROR);
18721774 
....@@ -1895,20 +1797,17 @@
18951797 
18961798 		retval = ms_write_bytes(chip, WRITE_REG, (6 + MS_EXTRA_SIZE),
18971799 					NO_WAIT_INT, data, 16);
1898
-		if (retval != STATUS_SUCCESS) {
1800
+		if (retval != STATUS_SUCCESS)
18991801 			return STATUS_FAIL;
1900
-		}
19011802 
19021803 		retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
1903
-		if (retval != STATUS_SUCCESS) {
1804
+		if (retval != STATUS_SUCCESS)
19041805 			return STATUS_FAIL;
1905
-		}
19061806 
19071807 		ms_set_err_code(chip, MS_NO_ERROR);
19081808 		retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
1909
-		if (retval != STATUS_SUCCESS) {
1809
+		if (retval != STATUS_SUCCESS)
19101810 			return STATUS_FAIL;
1911
-		}
19121811 
19131812 		if (val & INT_REG_CMDNK) {
19141813 			ms_set_err_code(chip, MS_CMD_NK);
....@@ -1923,12 +1822,11 @@
19231822 		}
19241823 
19251824 		if (i == 0) {
1926
-			retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
1927
-						    MS_EXTRA_SIZE, SystemParm,
1825
+			retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG,
1826
+						    MS_EXTRA_SIZE, SYSTEM_PARAM,
19281827 						    7);
1929
-			if (retval != STATUS_SUCCESS) {
1828
+			if (retval != STATUS_SUCCESS)
19301829 				return STATUS_FAIL;
1931
-			}
19321830 
19331831 			ms_set_err_code(chip, MS_NO_ERROR);
19341832 
....@@ -1947,21 +1845,18 @@
19471845 
19481846 			retval = ms_write_bytes(chip, WRITE_REG, 7,
19491847 						NO_WAIT_INT, data, 8);
1950
-			if (retval != STATUS_SUCCESS) {
1848
+			if (retval != STATUS_SUCCESS)
19511849 				return STATUS_FAIL;
1952
-			}
19531850 
19541851 			retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
1955
-			if (retval != STATUS_SUCCESS) {
1852
+			if (retval != STATUS_SUCCESS)
19561853 				return STATUS_FAIL;
1957
-			}
19581854 
19591855 			ms_set_err_code(chip, MS_NO_ERROR);
19601856 			retval = ms_read_bytes(chip, GET_INT, 1,
19611857 					       NO_WAIT_INT, &val, 1);
1962
-			if (retval != STATUS_SUCCESS) {
1858
+			if (retval != STATUS_SUCCESS)
19631859 				return STATUS_FAIL;
1964
-			}
19651860 
19661861 			if (val & INT_REG_CMDNK) {
19671862 				ms_set_err_code(chip, MS_CMD_NK);
....@@ -1992,26 +1887,23 @@
19921887 #endif
19931888 
19941889 	retval = ms_prepare_reset(chip);
1995
-	if (retval != STATUS_SUCCESS) {
1890
+	if (retval != STATUS_SUCCESS)
19961891 		return STATUS_FAIL;
1997
-	}
19981892 
19991893 	ms_card->ms_type |= TYPE_MS;
20001894 
20011895 	retval = ms_send_cmd(chip, MS_RESET, NO_WAIT_INT);
2002
-	if (retval != STATUS_SUCCESS) {
1896
+	if (retval != STATUS_SUCCESS)
20031897 		return STATUS_FAIL;
2004
-	}
20051898 
20061899 	retval = ms_read_status_reg(chip);
2007
-	if (retval != STATUS_SUCCESS) {
1900
+	if (retval != STATUS_SUCCESS)
20081901 		return STATUS_FAIL;
2009
-	}
20101902 
20111903 	retval = rtsx_read_register(chip, PPBUF_BASE2, &val);
2012
-	if (retval) {
1904
+	if (retval)
20131905 		return retval;
2014
-	}
1906
+
20151907 	if (val & WRT_PRTCT)
20161908 		chip->card_wp |= MS_CARD;
20171909 	else
....@@ -2059,9 +1951,8 @@
20591951 	}
20601952 
20611953 	retval = ms_read_page(chip, ms_card->boot_block, 0);
2062
-	if (retval != STATUS_SUCCESS) {
1954
+	if (retval != STATUS_SUCCESS)
20631955 		return STATUS_FAIL;
2064
-	}
20651956 
20661957 	/* Read MS system information as sys_info */
20671958 	rtsx_init_cmd(chip);
....@@ -2070,9 +1961,8 @@
20701961 		rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 0x1A0 + i, 0, 0);
20711962 
20721963 	retval = rtsx_send_cmd(chip, MS_CARD, 100);
2073
-	if (retval < 0) {
1964
+	if (retval < 0)
20741965 		return STATUS_FAIL;
2075
-	}
20761966 
20771967 	ptr = rtsx_get_cmd_data(chip);
20781968 	memcpy(ms_card->raw_sys_info, ptr, 96);
....@@ -2090,13 +1980,12 @@
20901980 	for (reg_addr = BLOCK_SIZE_0; reg_addr <= PAGE_SIZE_1; reg_addr++)
20911981 		rtsx_add_cmd(chip, READ_REG_CMD, reg_addr, 0, 0);
20921982 
2093
-	rtsx_add_cmd(chip, READ_REG_CMD, MS_Device_Type, 0, 0);
2094
-	rtsx_add_cmd(chip, READ_REG_CMD, MS_4bit_Support, 0, 0);
1983
+	rtsx_add_cmd(chip, READ_REG_CMD, MS_device_type, 0, 0);
1984
+	rtsx_add_cmd(chip, READ_REG_CMD, MS_4bit_support, 0, 0);
20951985 
20961986 	retval = rtsx_send_cmd(chip, MS_CARD, 100);
2097
-	if (retval < 0) {
1987
+	if (retval < 0)
20981988 		return STATUS_FAIL;
2099
-	}
21001989 
21011990 	ptr = rtsx_get_cmd_data(chip);
21021991 
....@@ -2168,34 +2057,30 @@
21682057 
21692058 	/* Switch I/F Mode */
21702059 	if (ptr[15]) {
2171
-		retval = ms_set_rw_reg_addr(chip, 0, 0, SystemParm, 1);
2172
-		if (retval != STATUS_SUCCESS) {
2060
+		retval = ms_set_rw_reg_addr(chip, 0, 0, SYSTEM_PARAM, 1);
2061
+		if (retval != STATUS_SUCCESS)
21732062 			return STATUS_FAIL;
2174
-		}
21752063 
21762064 		retval = rtsx_write_register(chip, PPBUF_BASE2, 0xFF, 0x88);
2177
-		if (retval) {
2065
+		if (retval)
21782066 			return retval;
2179
-		}
2067
+
21802068 		retval = rtsx_write_register(chip, PPBUF_BASE2 + 1, 0xFF, 0);
2181
-		if (retval) {
2069
+		if (retval)
21822070 			return retval;
2183
-		}
21842071 
21852072 		retval = ms_transfer_tpc(chip, MS_TM_WRITE_BYTES, WRITE_REG, 1,
21862073 					 NO_WAIT_INT);
2187
-		if (retval != STATUS_SUCCESS) {
2074
+		if (retval != STATUS_SUCCESS)
21882075 			return STATUS_FAIL;
2189
-		}
21902076 
21912077 		retval = rtsx_write_register(chip, MS_CFG,
21922078 					     0x58 | MS_NO_CHECK_INT,
21932079 					     MS_BUS_WIDTH_4 |
21942080 					     PUSH_TIME_ODD |
21952081 					     MS_NO_CHECK_INT);
2196
-		if (retval) {
2082
+		if (retval)
21972083 			return retval;
2198
-		}
21992084 
22002085 		ms_card->ms_type |= MS_4BIT;
22012086 	}
....@@ -2221,28 +2106,24 @@
22212106 
22222107 	size = ms_card->segment_cnt * sizeof(struct zone_entry);
22232108 	ms_card->segment = vzalloc(size);
2224
-	if (!ms_card->segment) {
2109
+	if (!ms_card->segment)
22252110 		return STATUS_FAIL;
2226
-	}
22272111 
22282112 	retval = ms_read_page(chip, ms_card->boot_block, 1);
2229
-	if (retval != STATUS_SUCCESS) {
2113
+	if (retval != STATUS_SUCCESS)
22302114 		goto INIT_FAIL;
2231
-	}
22322115 
22332116 	reg_addr = PPBUF_BASE2;
22342117 	for (i = 0; i < (((ms_card->total_block >> 9) * 10) + 1); i++) {
22352118 		int block_no;
22362119 
22372120 		retval = rtsx_read_register(chip, reg_addr++, &val1);
2238
-		if (retval != STATUS_SUCCESS) {
2121
+		if (retval != STATUS_SUCCESS)
22392122 			goto INIT_FAIL;
2240
-		}
22412123 
22422124 		retval = rtsx_read_register(chip, reg_addr++, &val2);
2243
-		if (retval != STATUS_SUCCESS) {
2125
+		if (retval != STATUS_SUCCESS)
22442126 			goto INIT_FAIL;
2245
-		}
22462127 
22472128 		defect_block = ((u16)val1 << 8) | val2;
22482129 		if (defect_block == 0xFFFF)
....@@ -2403,9 +2284,8 @@
24032284 
24042285 	if (!ms_card->segment) {
24052286 		retval = ms_init_l2p_tbl(chip);
2406
-		if (retval != STATUS_SUCCESS) {
2287
+		if (retval != STATUS_SUCCESS)
24072288 			return retval;
2408
-		}
24092289 	}
24102290 
24112291 	if (ms_card->segment[seg_no].build_flag) {
....@@ -2423,19 +2303,17 @@
24232303 
24242304 	if (!segment->l2p_table) {
24252305 		segment->l2p_table = vmalloc(array_size(table_size, 2));
2426
-		if (!segment->l2p_table) {
2306
+		if (!segment->l2p_table)
24272307 			goto BUILD_FAIL;
2428
-		}
24292308 	}
2430
-	memset((u8 *)(segment->l2p_table), 0xff, table_size * 2);
2309
+	memset((u8 *)(segment->l2p_table), 0xff, array_size(table_size, 2));
24312310 
24322311 	if (!segment->free_table) {
2433
-		segment->free_table = vmalloc(MS_FREE_TABLE_CNT * 2);
2434
-		if (!segment->free_table) {
2312
+		segment->free_table = vmalloc(array_size(MS_FREE_TABLE_CNT, 2));
2313
+		if (!segment->free_table)
24352314 			goto BUILD_FAIL;
2436
-		}
24372315 	}
2438
-	memset((u8 *)(segment->free_table), 0xff, MS_FREE_TABLE_CNT * 2);
2316
+	memset((u8 *)(segment->free_table), 0xff, array_size(MS_FREE_TABLE_CNT, 2));
24392317 
24402318 	start = (u16)seg_no << 9;
24412319 	end = (u16)(seg_no + 1) << 9;
....@@ -2558,9 +2436,8 @@
25582436 				return STATUS_SUCCESS;
25592437 			}
25602438 			retval = ms_init_page(chip, phy_blk, log_blk, 0, 1);
2561
-			if (retval != STATUS_SUCCESS) {
2439
+			if (retval != STATUS_SUCCESS)
25622440 				goto BUILD_FAIL;
2563
-			}
25642441 
25652442 			segment->l2p_table[idx] = phy_blk;
25662443 			if (seg_no == ms_card->segment_cnt - 1) {
....@@ -2591,16 +2468,14 @@
25912468 				retval = ms_copy_page(chip, tmp_blk, phy_blk,
25922469 						      log_blk, 0,
25932470 						      ms_card->page_off + 1);
2594
-				if (retval != STATUS_SUCCESS) {
2471
+				if (retval != STATUS_SUCCESS)
25952472 					return STATUS_FAIL;
2596
-				}
25972473 
25982474 				segment->l2p_table[log_blk] = phy_blk;
25992475 
26002476 				retval = ms_set_bad_block(chip, tmp_blk);
2601
-				if (retval != STATUS_SUCCESS) {
2477
+				if (retval != STATUS_SUCCESS)
26022478 					return STATUS_FAIL;
2603
-				}
26042479 			}
26052480 		}
26062481 	}
....@@ -2626,14 +2501,12 @@
26262501 	memset(ms_card, 0, sizeof(struct ms_info));
26272502 
26282503 	retval = enable_card_clock(chip, MS_CARD);
2629
-	if (retval != STATUS_SUCCESS) {
2504
+	if (retval != STATUS_SUCCESS)
26302505 		return STATUS_FAIL;
2631
-	}
26322506 
26332507 	retval = select_card(chip, MS_CARD);
2634
-	if (retval != STATUS_SUCCESS) {
2508
+	if (retval != STATUS_SUCCESS)
26352509 		return STATUS_FAIL;
2636
-	}
26372510 
26382511 	ms_card->ms_type = 0;
26392512 
....@@ -2641,27 +2514,24 @@
26412514 	if (retval != STATUS_SUCCESS) {
26422515 		if (ms_card->check_ms_flow) {
26432516 			retval = reset_ms(chip);
2644
-			if (retval != STATUS_SUCCESS) {
2517
+			if (retval != STATUS_SUCCESS)
26452518 				return STATUS_FAIL;
2646
-			}
26472519 		} else {
26482520 			return STATUS_FAIL;
26492521 		}
26502522 	}
26512523 
26522524 	retval = ms_set_init_para(chip);
2653
-	if (retval != STATUS_SUCCESS) {
2525
+	if (retval != STATUS_SUCCESS)
26542526 		return STATUS_FAIL;
2655
-	}
26562527 
26572528 	if (!CHK_MSPRO(ms_card)) {
26582529 		/* Build table for the last segment,
26592530 		 * to check if L2P table block exists, erasing it
26602531 		 */
26612532 		retval = ms_build_l2p_tbl(chip, seg_no);
2662
-		if (retval != STATUS_SUCCESS) {
2533
+		if (retval != STATUS_SUCCESS)
26632534 			return STATUS_FAIL;
2664
-		}
26652535 	}
26662536 
26672537 	dev_dbg(rtsx_dev(chip), "ms_card->ms_type = 0x%x\n", ms_card->ms_type);
....@@ -2690,9 +2560,8 @@
26902560 		if (retval == STATUS_SUCCESS)
26912561 			break;
26922562 	}
2693
-	if (i == MS_MAX_RETRY_COUNT) {
2563
+	if (i == MS_MAX_RETRY_COUNT)
26942564 		return STATUS_FAIL;
2695
-	}
26962565 
26972566 	return STATUS_SUCCESS;
26982567 }
....@@ -2731,9 +2600,8 @@
27312600 	}
27322601 
27332602 	retval = ms_switch_clock(chip);
2734
-	if (retval != STATUS_SUCCESS) {
2603
+	if (retval != STATUS_SUCCESS)
27352604 		return STATUS_FAIL;
2736
-	}
27372605 
27382606 	return STATUS_SUCCESS;
27392607 }
....@@ -2782,9 +2650,8 @@
27822650 	}
27832651 
27842652 	retval = ms_switch_clock(chip);
2785
-	if (retval != STATUS_SUCCESS) {
2653
+	if (retval != STATUS_SUCCESS)
27862654 		return STATUS_FAIL;
2787
-	}
27882655 
27892656 	if (srb->sc_data_direction == DMA_FROM_DEVICE)
27902657 		trans_mode = MS_TM_AUTO_READ;
....@@ -2792,9 +2659,8 @@
27922659 		trans_mode = MS_TM_AUTO_WRITE;
27932660 
27942661 	retval = rtsx_read_register(chip, MS_TRANS_CFG, &val);
2795
-	if (retval) {
2662
+	if (retval)
27962663 		return retval;
2797
-	}
27982664 
27992665 	if (ms_card->seq_mode) {
28002666 		if ((ms_card->pre_dir != srb->sc_data_direction) ||
....@@ -2808,9 +2674,8 @@
28082674 			ms_card->total_sec_cnt = 0;
28092675 			if (val & MS_INT_BREQ) {
28102676 				retval = ms_send_cmd(chip, PRO_STOP, WAIT_INT);
2811
-				if (retval != STATUS_SUCCESS) {
2677
+				if (retval != STATUS_SUCCESS)
28122678 					return STATUS_FAIL;
2813
-				}
28142679 
28152680 				rtsx_write_register(chip, RBCTL, RB_FLUSH,
28162681 						    RB_FLUSH);
....@@ -3019,14 +2884,12 @@
30192884 	u16 para;
30202885 
30212886 	retval = ms_switch_clock(chip);
3022
-	if (retval != STATUS_SUCCESS) {
2887
+	if (retval != STATUS_SUCCESS)
30232888 		return STATUS_FAIL;
3024
-	}
30252889 
3026
-	retval = ms_set_rw_reg_addr(chip, 0x00, 0x00, Pro_TPCParm, 0x01);
3027
-	if (retval != STATUS_SUCCESS) {
2890
+	retval = ms_set_rw_reg_addr(chip, 0x00, 0x00, PRO_TPC_PARM, 0x01);
2891
+	if (retval != STATUS_SUCCESS)
30282892 		return STATUS_FAIL;
3029
-	}
30302893 
30312894 	memset(buf, 0, 2);
30322895 	switch (short_data_len) {
....@@ -3051,9 +2914,8 @@
30512914 		if (retval == STATUS_SUCCESS)
30522915 			break;
30532916 	}
3054
-	if (i == MS_MAX_RETRY_COUNT) {
2917
+	if (i == MS_MAX_RETRY_COUNT)
30552918 		return STATUS_FAIL;
3056
-	}
30572919 
30582920 	if (quick_format)
30592921 		para = 0x0000;
....@@ -3061,18 +2923,15 @@
30612923 		para = 0x0001;
30622924 
30632925 	retval = mspro_set_rw_cmd(chip, 0, para, PRO_FORMAT);
3064
-	if (retval != STATUS_SUCCESS) {
2926
+	if (retval != STATUS_SUCCESS)
30652927 		return STATUS_FAIL;
3066
-	}
30672928 
30682929 	retval = rtsx_read_register(chip, MS_TRANS_CFG, &tmp);
3069
-	if (retval) {
2930
+	if (retval)
30702931 		return retval;
3071
-	}
30722932 
3073
-	if (tmp & (MS_INT_CMDNK | MS_INT_ERR)) {
2933
+	if (tmp & (MS_INT_CMDNK | MS_INT_ERR))
30742934 		return STATUS_FAIL;
3075
-	}
30762935 
30772936 	if ((tmp & (MS_INT_BREQ | MS_INT_CED)) == MS_INT_BREQ) {
30782937 		ms_card->pro_under_formatting = 1;
....@@ -3111,11 +2970,10 @@
31112970 		}
31122971 	}
31132972 
3114
-	retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
3115
-				    SystemParm, 6);
3116
-	if (retval != STATUS_SUCCESS) {
2973
+	retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
2974
+				    SYSTEM_PARAM, 6);
2975
+	if (retval != STATUS_SUCCESS)
31172976 		return STATUS_FAIL;
3118
-	}
31192977 
31202978 	if (CHK_MS4BIT(ms_card))
31212979 		data[0] = 0x88;
....@@ -3134,16 +2992,14 @@
31342992 		if (retval == STATUS_SUCCESS)
31352993 			break;
31362994 	}
3137
-	if (i == MS_MAX_RETRY_COUNT) {
2995
+	if (i == MS_MAX_RETRY_COUNT)
31382996 		return STATUS_FAIL;
3139
-	}
31402997 
31412998 	ms_set_err_code(chip, MS_NO_ERROR);
31422999 
31433000 	retval = ms_send_cmd(chip, BLOCK_READ, WAIT_INT);
3144
-	if (retval != STATUS_SUCCESS) {
3001
+	if (retval != STATUS_SUCCESS)
31453002 		return STATUS_FAIL;
3146
-	}
31473003 
31483004 	ptr = buf;
31493005 
....@@ -3156,9 +3012,8 @@
31563012 		}
31573013 
31583014 		retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
3159
-		if (retval != STATUS_SUCCESS) {
3015
+		if (retval != STATUS_SUCCESS)
31603016 			return STATUS_FAIL;
3161
-		}
31623017 
31633018 		if (val & INT_REG_CMDNK) {
31643019 			ms_set_err_code(chip, MS_CMD_NK);
....@@ -3171,7 +3026,7 @@
31713026 					if (!(chip->card_wp & MS_CARD)) {
31723027 						reset_ms(chip);
31733028 						ms_set_page_status
3174
-							(log_blk, setPS_NG,
3029
+							(log_blk, set_PS_NG,
31753030 							 extra,
31763031 							 MS_EXTRA_SIZE);
31773032 						ms_write_extra_data
....@@ -3197,16 +3052,14 @@
31973052 		if (page_addr == (end_page - 1)) {
31983053 			if (!(val & INT_REG_CED)) {
31993054 				retval = ms_send_cmd(chip, BLOCK_END, WAIT_INT);
3200
-				if (retval != STATUS_SUCCESS) {
3055
+				if (retval != STATUS_SUCCESS)
32013056 					return STATUS_FAIL;
3202
-				}
32033057 			}
32043058 
32053059 			retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT,
32063060 					       &val, 1);
3207
-			if (retval != STATUS_SUCCESS) {
3061
+			if (retval != STATUS_SUCCESS)
32083062 				return STATUS_FAIL;
3209
-			}
32103063 
32113064 			if (!(val & INT_REG_CED)) {
32123065 				ms_set_err_code(chip, MS_FLASH_READ_ERROR);
....@@ -3278,11 +3131,10 @@
32783131 	u8 *ptr;
32793132 
32803133 	if (!start_page) {
3281
-		retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
3282
-					    SystemParm, 7);
3283
-		if (retval != STATUS_SUCCESS) {
3134
+		retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
3135
+					    SYSTEM_PARAM, 7);
3136
+		if (retval != STATUS_SUCCESS)
32843137 			return STATUS_FAIL;
3285
-		}
32863138 
32873139 		if (CHK_MS4BIT(ms_card))
32883140 			data[0] = 0x88;
....@@ -3299,28 +3151,24 @@
32993151 
33003152 		retval = ms_write_bytes(chip, WRITE_REG, 7, NO_WAIT_INT,
33013153 					data, 8);
3302
-		if (retval != STATUS_SUCCESS) {
3154
+		if (retval != STATUS_SUCCESS)
33033155 			return STATUS_FAIL;
3304
-		}
33053156 
33063157 		retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
3307
-		if (retval != STATUS_SUCCESS) {
3158
+		if (retval != STATUS_SUCCESS)
33083159 			return STATUS_FAIL;
3309
-		}
33103160 
33113161 		ms_set_err_code(chip, MS_NO_ERROR);
33123162 		retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, GET_INT, 1,
33133163 					 NO_WAIT_INT);
3314
-		if (retval != STATUS_SUCCESS) {
3164
+		if (retval != STATUS_SUCCESS)
33153165 			return STATUS_FAIL;
3316
-		}
33173166 	}
33183167 
3319
-	retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
3320
-				    SystemParm, (6 + MS_EXTRA_SIZE));
3321
-	if (retval != STATUS_SUCCESS) {
3168
+	retval = ms_set_rw_reg_addr(chip, OVERWRITE_FLAG, MS_EXTRA_SIZE,
3169
+				    SYSTEM_PARAM, (6 + MS_EXTRA_SIZE));
3170
+	if (retval != STATUS_SUCCESS)
33223171 		return STATUS_FAIL;
3323
-	}
33243172 
33253173 	ms_set_err_code(chip, MS_NO_ERROR);
33263174 
....@@ -3352,23 +3200,20 @@
33523200 		if (retval == STATUS_SUCCESS)
33533201 			break;
33543202 	}
3355
-	if (i == MS_MAX_RETRY_COUNT) {
3203
+	if (i == MS_MAX_RETRY_COUNT)
33563204 		return STATUS_FAIL;
3357
-	}
33583205 
33593206 	for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
33603207 		retval = ms_send_cmd(chip, BLOCK_WRITE, WAIT_INT);
33613208 		if (retval == STATUS_SUCCESS)
33623209 			break;
33633210 	}
3364
-	if (i == MS_MAX_RETRY_COUNT) {
3211
+	if (i == MS_MAX_RETRY_COUNT)
33653212 		return STATUS_FAIL;
3366
-	}
33673213 
33683214 	retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
3369
-	if (retval != STATUS_SUCCESS) {
3215
+	if (retval != STATUS_SUCCESS)
33703216 		return STATUS_FAIL;
3371
-	}
33723217 
33733218 	ptr = buf;
33743219 	for (page_addr = start_page; page_addr < end_page; page_addr++) {
....@@ -3421,16 +3266,14 @@
34213266 			ms_set_err_code(chip, MS_TO_ERROR);
34223267 			rtsx_clear_ms_error(chip);
34233268 
3424
-			if (retval == -ETIMEDOUT) {
3269
+			if (retval == -ETIMEDOUT)
34253270 				return STATUS_TIMEDOUT;
3426
-			}
34273271 			return STATUS_FAIL;
34283272 		}
34293273 
34303274 		retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT, &val, 1);
3431
-		if (retval != STATUS_SUCCESS) {
3275
+		if (retval != STATUS_SUCCESS)
34323276 			return STATUS_FAIL;
3433
-		}
34343277 
34353278 		if ((end_page - start_page) == 1) {
34363279 			if (!(val & INT_REG_CED)) {
....@@ -3442,16 +3285,14 @@
34423285 				if (!(val & INT_REG_CED)) {
34433286 					retval = ms_send_cmd(chip, BLOCK_END,
34443287 							     WAIT_INT);
3445
-					if (retval != STATUS_SUCCESS) {
3288
+					if (retval != STATUS_SUCCESS)
34463289 						return STATUS_FAIL;
3447
-					}
34483290 				}
34493291 
34503292 				retval = ms_read_bytes(chip, GET_INT, 1,
34513293 						       NO_WAIT_INT, &val, 1);
3452
-				if (retval != STATUS_SUCCESS) {
3294
+				if (retval != STATUS_SUCCESS)
34533295 					return STATUS_FAIL;
3454
-				}
34553296 			}
34563297 
34573298 			if ((page_addr == (end_page - 1)) ||
....@@ -3479,9 +3320,8 @@
34793320 
34803321 	retval = ms_copy_page(chip, old_blk, new_blk, log_blk,
34813322 			      page_off, ms_card->page_off + 1);
3482
-	if (retval != STATUS_SUCCESS) {
3323
+	if (retval != STATUS_SUCCESS)
34833324 		return STATUS_FAIL;
3484
-	}
34853325 
34863326 	seg_no = old_blk >> 9;
34873327 
....@@ -3507,9 +3347,8 @@
35073347 	if (start_page) {
35083348 		retval = ms_copy_page(chip, old_blk, new_blk, log_blk,
35093349 				      0, start_page);
3510
-		if (retval != STATUS_SUCCESS) {
3350
+		if (retval != STATUS_SUCCESS)
35113351 			return STATUS_FAIL;
3512
-		}
35133352 	}
35143353 
35153354 	return STATUS_SUCCESS;
....@@ -3524,9 +3363,8 @@
35243363 
35253364 	if (delay_write->delay_write_flag) {
35263365 		retval = ms_set_init_para(chip);
3527
-		if (retval != STATUS_SUCCESS) {
3366
+		if (retval != STATUS_SUCCESS)
35283367 			return STATUS_FAIL;
3529
-		}
35303368 
35313369 		delay_write->delay_write_flag = 0;
35323370 		retval = ms_finish_write(chip,
....@@ -3534,9 +3372,8 @@
35343372 					delay_write->new_phyblock,
35353373 					delay_write->logblock,
35363374 					delay_write->pageoff);
3537
-		if (retval != STATUS_SUCCESS) {
3375
+		if (retval != STATUS_SUCCESS)
35383376 			return STATUS_FAIL;
3539
-		}
35403377 	}
35413378 
35423379 	return STATUS_SUCCESS;
....@@ -3850,14 +3687,12 @@
38503687 	rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANS_CFG, MS_INT_CED, MS_INT_CED);
38513688 
38523689 	retval = rtsx_send_cmd(chip, MS_CARD, 5000);
3853
-	if (retval != STATUS_SUCCESS) {
3690
+	if (retval != STATUS_SUCCESS)
38543691 		return STATUS_FAIL;
3855
-	}
38563692 
38573693 	val = *rtsx_get_cmd_data(chip);
3858
-	if (val & MS_INT_ERR) {
3694
+	if (val & MS_INT_ERR)
38593695 		return STATUS_FAIL;
3860
-	}
38613696 
38623697 	return STATUS_SUCCESS;
38633698 }
....@@ -3920,9 +3755,8 @@
39203755 		if (retval == STATUS_SUCCESS)
39213756 			break;
39223757 	}
3923
-	if (i == MS_MAX_RETRY_COUNT) {
3758
+	if (i == MS_MAX_RETRY_COUNT)
39243759 		return STATUS_FAIL;
3925
-	}
39263760 
39273761 	if (check_ms_err(chip)) {
39283762 		rtsx_clear_ms_error(chip);
....@@ -3939,13 +3773,12 @@
39393773 	u8 buf[6];
39403774 
39413775 	if (type == 0)
3942
-		retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_TPCParm, 1);
3776
+		retval = ms_set_rw_reg_addr(chip, 0, 0, PRO_TPC_PARM, 1);
39433777 	else
3944
-		retval = ms_set_rw_reg_addr(chip, 0, 0, Pro_DataCount1, 6);
3778
+		retval = ms_set_rw_reg_addr(chip, 0, 0, PRO_DATA_COUNT1, 6);
39453779 
3946
-	if (retval != STATUS_SUCCESS) {
3780
+	if (retval != STATUS_SUCCESS)
39473781 		return STATUS_FAIL;
3948
-	}
39493782 
39503783 	buf[0] = 0;
39513784 	buf[1] = 0;
....@@ -3957,9 +3790,8 @@
39573790 	}
39583791 	retval = ms_write_bytes(chip, PRO_WRITE_REG, (type == 0) ? 1 : 6,
39593792 				NO_WAIT_INT, buf, 6);
3960
-	if (retval != STATUS_SUCCESS) {
3793
+	if (retval != STATUS_SUCCESS)
39613794 		return STATUS_FAIL;
3962
-	}
39633795 
39643796 	return STATUS_SUCCESS;
39653797 }
....@@ -3979,9 +3811,8 @@
39793811 	ms_cleanup_work(chip);
39803812 
39813813 	retval = ms_switch_clock(chip);
3982
-	if (retval != STATUS_SUCCESS) {
3814
+	if (retval != STATUS_SUCCESS)
39833815 		return STATUS_FAIL;
3984
-	}
39853816 
39863817 	retval = mg_send_ex_cmd(chip, MG_SET_LID, 0);
39873818 	if (retval != STATUS_SUCCESS) {
....@@ -4011,7 +3842,7 @@
40113842 
40123843 int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip)
40133844 {
4014
-	int retval = STATUS_FAIL;
3845
+	int retval;
40153846 	int bufflen;
40163847 	unsigned int lun = SCSI_LUN(srb);
40173848 	u8 *buf = NULL;
....@@ -4019,14 +3850,12 @@
40193850 	ms_cleanup_work(chip);
40203851 
40213852 	retval = ms_switch_clock(chip);
4022
-	if (retval != STATUS_SUCCESS) {
3853
+	if (retval != STATUS_SUCCESS)
40233854 		return STATUS_FAIL;
4024
-	}
40253855 
40263856 	buf = kmalloc(1540, GFP_KERNEL);
4027
-	if (!buf) {
3857
+	if (!buf)
40283858 		return STATUS_ERROR;
4029
-	}
40303859 
40313860 	buf[0] = 0x04;
40323861 	buf[1] = 0x1A;
....@@ -4073,9 +3902,8 @@
40733902 	ms_cleanup_work(chip);
40743903 
40753904 	retval = ms_switch_clock(chip);
4076
-	if (retval != STATUS_SUCCESS) {
3905
+	if (retval != STATUS_SUCCESS)
40773906 		return STATUS_FAIL;
4078
-	}
40793907 
40803908 	retval = mg_send_ex_cmd(chip, MG_GET_ID, 0);
40813909 	if (retval != STATUS_SUCCESS) {
....@@ -4148,9 +3976,8 @@
41483976 	ms_cleanup_work(chip);
41493977 
41503978 	retval = ms_switch_clock(chip);
4151
-	if (retval != STATUS_SUCCESS) {
3979
+	if (retval != STATUS_SUCCESS)
41523980 		return STATUS_FAIL;
4153
-	}
41543981 
41553982 	retval = mg_send_ex_cmd(chip, MG_MAKE_RMS, 0);
41563983 	if (retval != STATUS_SUCCESS) {
....@@ -4204,9 +4031,8 @@
42044031 	ms_cleanup_work(chip);
42054032 
42064033 	retval = ms_switch_clock(chip);
4207
-	if (retval != STATUS_SUCCESS) {
4034
+	if (retval != STATUS_SUCCESS)
42084035 		return STATUS_FAIL;
4209
-	}
42104036 
42114037 	retval = mg_send_ex_cmd(chip, MG_MAKE_KSE, 0);
42124038 	if (retval != STATUS_SUCCESS) {
....@@ -4251,14 +4077,12 @@
42514077 	ms_cleanup_work(chip);
42524078 
42534079 	retval = ms_switch_clock(chip);
4254
-	if (retval != STATUS_SUCCESS) {
4080
+	if (retval != STATUS_SUCCESS)
42554081 		return STATUS_FAIL;
4256
-	}
42574082 
42584083 	buf = kmalloc(1028, GFP_KERNEL);
4259
-	if (!buf) {
4084
+	if (!buf)
42604085 		return STATUS_ERROR;
4261
-	}
42624086 
42634087 	buf[0] = 0x04;
42644088 	buf[1] = 0x02;
....@@ -4307,14 +4131,12 @@
43074131 	ms_cleanup_work(chip);
43084132 
43094133 	retval = ms_switch_clock(chip);
4310
-	if (retval != STATUS_SUCCESS) {
4134
+	if (retval != STATUS_SUCCESS)
43114135 		return STATUS_FAIL;
4312
-	}
43134136 
43144137 	buf = kmalloc(1028, GFP_KERNEL);
4315
-	if (!buf) {
4138
+	if (!buf)
43164139 		return STATUS_ERROR;
4317
-	}
43184140 
43194141 	bufflen = min_t(int, 1028, scsi_bufflen(srb));
43204142 	rtsx_stor_get_xfer_buf(buf, bufflen, srb);
....@@ -4332,7 +4154,7 @@
43324154 		} else {
43334155 			set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
43344156 		}
4335
-		goto SetICVFinish;
4157
+		goto set_ICV_finish;
43364158 	}
43374159 
43384160 #ifdef MG_SET_ICV_SLOW
....@@ -4373,7 +4195,7 @@
43734195 					       SENSE_TYPE_MG_WRITE_ERR);
43744196 			}
43754197 			retval = STATUS_FAIL;
4376
-			goto SetICVFinish;
4198
+			goto set_ICV_finish;
43774199 		}
43784200 	}
43794201 #else
....@@ -4392,11 +4214,11 @@
43924214 		} else {
43934215 			set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
43944216 		}
4395
-		goto SetICVFinish;
4217
+		goto set_ICV_finish;
43964218 	}
43974219 #endif
43984220 
4399
-SetICVFinish:
4221
+set_ICV_finish:
44004222 	kfree(buf);
44014223 	return retval;
44024224 }
....@@ -4433,32 +4255,28 @@
44334255 	int retval;
44344256 
44354257 	retval = disable_card_clock(chip, MS_CARD);
4436
-	if (retval != STATUS_SUCCESS) {
4258
+	if (retval != STATUS_SUCCESS)
44374259 		return STATUS_FAIL;
4438
-	}
44394260 
44404261 	if (chip->asic_code) {
44414262 		retval = ms_pull_ctl_disable(chip);
4442
-		if (retval != STATUS_SUCCESS) {
4263
+		if (retval != STATUS_SUCCESS)
44434264 			return STATUS_FAIL;
4444
-		}
44454265 	} else {
44464266 		retval = rtsx_write_register(chip, FPGA_PULL_CTL,
44474267 					     FPGA_MS_PULL_CTL_BIT | 0x20,
44484268 					     FPGA_MS_PULL_CTL_BIT);
4449
-		if (retval) {
4269
+		if (retval)
44504270 			return retval;
4451
-		}
44524271 	}
44534272 	retval = rtsx_write_register(chip, CARD_OE, MS_OUTPUT_EN, 0);
4454
-	if (retval) {
4273
+	if (retval)
44554274 		return retval;
4456
-	}
4275
+
44574276 	if (!chip->ft2_fast_mode) {
44584277 		retval = card_power_off(chip, MS_CARD);
4459
-		if (retval != STATUS_SUCCESS) {
4278
+		if (retval != STATUS_SUCCESS)
44604279 			return STATUS_FAIL;
4461
-		}
44624280 	}
44634281 
44644282 	return STATUS_SUCCESS;
....@@ -4486,9 +4304,8 @@
44864304 #endif
44874305 
44884306 	retval = ms_power_off_card3v3(chip);
4489
-	if (retval != STATUS_SUCCESS) {
4307
+	if (retval != STATUS_SUCCESS)
44904308 		return STATUS_FAIL;
4491
-	}
44924309 
44934310 	return STATUS_SUCCESS;
44944311 }