staging: rts5139: remove unused variable option.ww_enable
authorOleksij Rempel <bug-track@fisher-privat.net>
Thu, 10 May 2012 07:59:39 +0000 (09:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 May 2012 16:57:21 +0000 (09:57 -0700)
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>
drivers/staging/rts5139/rts51x_chip.c
drivers/staging/rts5139/rts51x_chip.h

index a21f490..db88d7a 100644 (file)
@@ -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) {
@@ -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);
index 6755816..76e9c1b 100644 (file)
@@ -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;