Skip to content

Commit

Permalink
staging: rts5139: remove unused variable option.ww_enable
Browse files Browse the repository at this point in the history
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Oleksij Rempel authored and Greg Kroah-Hartman committed May 10, 2012
1 parent 39d6573 commit 0e545f6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
28 changes: 13 additions & 15 deletions drivers/staging/rts5139/rts51x_chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,18 @@ int rts51x_reset_chip(struct rts51x_chip *chip)
chip->option.sd20_pad_drive);
if (chip->rts5179)
rts51x_write_register(chip, CARD_PULL_CTL5, 0x03, 0x01);
if (!chip->option.ww_enable) {
if (CHECK_PKG(chip, LQFP48)) {
rts51x_write_register(chip, CARD_PULL_CTL3,
0x80, 0x80);
rts51x_write_register(chip, CARD_PULL_CTL6,
0xf0, 0xA0);
} else {
rts51x_write_register(chip, CARD_PULL_CTL1,
0x30, 0x20);
rts51x_write_register(chip, CARD_PULL_CTL3,
0x80, 0x80);
rts51x_write_register(chip, CARD_PULL_CTL6,
0x0c, 0x08);
}
if (CHECK_PKG(chip, LQFP48)) {
rts51x_write_register(chip, CARD_PULL_CTL3,
0x80, 0x80);
rts51x_write_register(chip, CARD_PULL_CTL6,
0xf0, 0xA0);
} else {
rts51x_write_register(chip, CARD_PULL_CTL1,
0x30, 0x20);
rts51x_write_register(chip, CARD_PULL_CTL3,
0x80, 0x80);
rts51x_write_register(chip, CARD_PULL_CTL6,
0x0c, 0x08);
}
}
if (chip->option.sd_ctl & SUPPORT_UHS50_MMC44) {
Expand Down Expand Up @@ -715,7 +713,7 @@ void rts51x_do_before_power_down(struct rts51x_chip *chip)
chip->cur_clk = 0;
chip->card_exist = 0;
chip->cur_card = 0;
if (chip->asic_code && !chip->option.ww_enable) {
if (chip->asic_code) {
if (CHECK_PKG(chip, LQFP48)) {
rts51x_write_register(chip, CARD_PULL_CTL3, 0x80, 0x00);
rts51x_write_register(chip, CARD_PULL_CTL6, 0xf0, 0x50);
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/rts5139/rts51x_chip.h
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ struct rts51x_option {
int ss_en;
/* Interval to enter SS from IDLE state (second) */
int ss_delay;
u8 ww_enable; /* sangdy2010-08-03:add for remote wakeup */

/* Enable SSC clock */
int ssc_en;
Expand Down

0 comments on commit 0e545f6

Please sign in to comment.