]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: rts5139: remove unused LED_AUTO_BLINK code
authorOleksij Rempel <bug-track@fisher-privat.net>
Fri, 4 May 2012 15:14:29 +0000 (17:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 May 2012 20:26:12 +0000 (13:26 -0700)
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rts5139/rts51x_chip.c
drivers/staging/rts5139/rts51x_chip.h

index 1f7593d7a2468f0cc3d575ab2ed8ee2661ff4bf1..1be4d49180446d0396bef2716eabb8fe2ac10c02 100644 (file)
@@ -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;
 
index 13fc2a410d90532d72fc642780d66a8b179ba12b..effed9f17f9194402f8137baf92b3f4a5841ccfb 100644 (file)
@@ -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;