From 81678c2b6d79a798c46754048a758e52a73160b3 Mon Sep 17 00:00:00 2001
From: Oleksij Rempel <bug-track@fisher-privat.net>
Date: Fri, 4 May 2012 17:14:29 +0200
Subject: [PATCH] --- yaml --- r: 304567 b: refs/heads/master c:
 3d2b3aacac35c375e4678b0d0537f5da88647acd h: refs/heads/master i:   304565:
 20332e349d8240cdce9e511f3d58d2b582097220   304563:
 a16b33e5c0b09eebd594a0de11e516a39ed20fca   304559:
 371b87da7802a7d75f51e7f9c11fce89eb205645 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/rts5139/rts51x_chip.c | 12 ------------
 trunk/drivers/staging/rts5139/rts51x_chip.h |  5 +----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 948399c9ef87..e3912e930157 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d66af05301c7859b676d95db915ebee4c8c01092
+refs/heads/master: 3d2b3aacac35c375e4678b0d0537f5da88647acd
diff --git a/trunk/drivers/staging/rts5139/rts51x_chip.c b/trunk/drivers/staging/rts5139/rts51x_chip.c
index 1f7593d7a246..1be4d4918044 100644
--- a/trunk/drivers/staging/rts5139/rts51x_chip.c
+++ b/trunk/drivers/staging/rts5139/rts51x_chip.c
@@ -121,12 +121,6 @@ int rts51x_reset_chip(struct rts51x_chip *chip)
 
 	/* GPIO OE */
 	rts51x_add_cmd(chip, WRITE_REG_CMD, CARD_GPIO, GPIO_OE, GPIO_OE);
-#ifdef LED_AUTO_BLINK
-	/* LED autoblink */
-	rts51x_add_cmd(chip, WRITE_REG_CMD, CARD_AUTO_BLINK,
-		       BLINK_ENABLE | BLINK_SPEED_MASK,
-		       BLINK_ENABLE | chip->option.led_blink_speed);
-#endif
 	rts51x_add_cmd(chip, WRITE_REG_CMD, CARD_DMA1_CTL,
 		       EXTEND_DMA1_ASYNC_SIGNAL, EXTEND_DMA1_ASYNC_SIGNAL);
 
@@ -230,7 +224,6 @@ int rts51x_release_chip(struct rts51x_chip *chip)
 	return STATUS_SUCCESS;
 }
 
-#ifndef LED_AUTO_BLINK
 static inline void rts51x_blink_led(struct rts51x_chip *chip)
 {
 	/* Read/Write */
@@ -244,7 +237,6 @@ static inline void rts51x_blink_led(struct rts51x_chip *chip)
 		}
 	}
 }
-#endif
 
 static void rts51x_auto_delink_cmd(struct rts51x_chip *chip)
 {
@@ -360,9 +352,7 @@ void rts51x_polling_func(struct rts51x_chip *chip)
 		if (!RTS51X_CHK_STAT(chip, STAT_IDLE)) {
 			RTS51X_DEBUGP("Idle state!\n");
 			RTS51X_SET_STAT(chip, STAT_IDLE);
-#ifndef LED_AUTO_BLINK
 			chip->led_toggle_counter = 0;
-#endif
 			/* Idle state, turn off LED
 			 * to reduce power consumption */
 			if (chip->option.led_always_on
@@ -396,9 +386,7 @@ void rts51x_polling_func(struct rts51x_chip *chip)
 
 	switch (RTS51X_GET_STAT(chip)) {
 	case STAT_RUN:
-#ifndef LED_AUTO_BLINK
 		rts51x_blink_led(chip);
-#endif
 		do_remaining_work(chip);
 		break;
 
diff --git a/trunk/drivers/staging/rts5139/rts51x_chip.h b/trunk/drivers/staging/rts5139/rts51x_chip.h
index 13fc2a410d90..effed9f17f91 100644
--- a/trunk/drivers/staging/rts5139/rts51x_chip.h
+++ b/trunk/drivers/staging/rts5139/rts51x_chip.h
@@ -39,8 +39,6 @@
 #define SUPPORT_CPRM
 #define SUPPORT_MAGIC_GATE
 #define SUPPORT_MSXC
-/* #define LED_AUTO_BLINK */
-
 /* { wwang, 2010-07-26
  * Add support for SD lock/unlock */
 /* #define SUPPORT_SD_LOCK */
@@ -720,9 +718,8 @@ struct rts51x_chip {
 	struct scsi_cmnd *srb;
 	struct sense_data_t sense_buffer[MAX_ALLOWED_LUN_CNT];
 
-#ifndef LED_AUTO_BLINK
 	int led_toggle_counter;
-#endif
+
 	int ss_counter;
 	int idle_counter;
 	int auto_delink_counter;