---

yaml --- r: 304562 b: refs/heads/master c: bc5219b h: refs/heads/master v: v3
git-mirror · May 9, 2012 · 4ad588d · 4ad588d
1 parent fc8cbae
commit 4ad588d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f483279f71ea9e15e2f9c99fa9496acabf5ca9a
+refs/heads/master: bc5219bdebab65a75fd224634a355f4b14a39781
diff --git a/trunk/drivers/staging/rts5139/rts51x_card.c b/trunk/drivers/staging/rts5139/rts51x_card.c
@@ -191,7 +191,6 @@ void card_cd_debounce(struct rts51x_chip *chip, u8 *need_reset,
 		goto Exit_Debounce;
 
 	if (chip->card_exist) {
-		rts51x_clear_start_time(chip);
 		retval = rts51x_read_register(chip, CARD_INT_PEND, &value);
 		if (retval != STATUS_SUCCESS) {
 			rts51x_ep0_write_register(chip, MC_FIFO_CTL, FIFO_FLUSH,
@@ -214,17 +213,11 @@ void card_cd_debounce(struct rts51x_chip *chip, u8 *need_reset,
 		}
 	} else {
 		if (chip->card_status & XD_CD) {
-			rts51x_clear_start_time(chip);
 			reset_map |= XD_CARD;
 		} else if (chip->card_status & SD_CD) {
-			rts51x_clear_start_time(chip);
 			reset_map |= SD_CARD;
 		} else if (chip->card_status & MS_CD) {
-			rts51x_clear_start_time(chip);
 			reset_map |= MS_CARD;
-		} else {
-			if (rts51x_check_start_time(chip))
-				rts51x_set_start_time(chip);
 		}
 	}
 

diff --git a/trunk/drivers/staging/rts5139/rts51x_chip.c b/trunk/drivers/staging/rts5139/rts51x_chip.c
@@ -144,7 +144,6 @@ int rts51x_reset_chip(struct rts51x_chip *chip)
 		card_power_on(chip, SD_CARD | MS_CARD | XD_CARD);
 		wait_timeout(10);
 	}
-	rts51x_clear_start_time(chip);
 
 	return STATUS_SUCCESS;
 }
@@ -253,19 +252,6 @@ static inline void rts51x_blink_led(struct rts51x_chip *chip)
 }
 #endif
 
-int rts51x_check_start_time(struct rts51x_chip *chip)
-{
-	return 0;
-}
-
-void rts51x_set_start_time(struct rts51x_chip *chip)
-{
-}
-
-void rts51x_clear_start_time(struct rts51x_chip *chip)
-{
-}
-
 static void rts51x_auto_delink_cmd(struct rts51x_chip *chip)
 {
 	rts51x_write_register(chip, AUTO_DELINK_EN,
@@ -484,7 +470,6 @@ void rts51x_polling_func(struct rts51x_chip *chip)
 		rts51x_auto_delink(chip);
 	} else {
 		chip->auto_delink_counter = 0;
-		rts51x_clear_start_time(chip);
 	}
 }
 

diff --git a/trunk/drivers/staging/rts5139/rts51x_sys.h b/trunk/drivers/staging/rts5139/rts51x_sys.h
@@ -33,10 +33,6 @@
 
 #define USING_POLLING_CYCLE_DELINK
 
-extern int  rts51x_check_start_time(struct rts51x_chip *chip);
-extern void rts51x_set_start_time(struct rts51x_chip *chip);
-extern void rts51x_clear_start_time(struct rts51x_chip *chip);
-
 /* typedef dma_addr_t ULONG_PTR; */
 
 static inline void rts51x_reset_detected_cards(struct rts51x_chip *chip)