Skip to content

Commit

Permalink
staging: rts5139: remove unused LED_AUTO_BLINK code
Browse files Browse the repository at this point in the history
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Oleksij Rempel authored and Greg Kroah-Hartman committed May 9, 2012
1 parent d66af05 commit 3d2b3aa
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
12 changes: 0 additions & 12 deletions drivers/staging/rts5139/rts51x_chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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 */
Expand All @@ -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)
{
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down
5 changes: 1 addition & 4 deletions drivers/staging/rts5139/rts51x_chip.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 3d2b3aa

Please sign in to comment.