Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[~andy/linux] / drivers / staging / rts5139 / rts51x_card.c

diff --git a/drivers/staging/rts5139/rts51x_card.c b/drivers/staging/rts5139/rts51x_card.c
index 4406bf90cb17a7e17122aae60711ad45d0096ac4..4192c3bac12f0ab6d95c018969d72599ef4e6944 100644 (file)
--- a/drivers/staging/rts5139/rts51x_card.c
+++ b/drivers/staging/rts5139/rts51x_card.c
@@ -827,16 +827,7 @@ int card_power_on(struct rts51x_chip *chip, u8 card)
        if ((card == SD_CARD) || (card == XD_CARD)) {
                RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask | LDO3318_PWR_MASK,
                                 val1 | LDO_SUSPEND);
-               /* RTS51X_WRITE_REG(chip, CARD_PWR_CTL,
-                               LDO3318_PWR_MASK, LDO_SUSPEND); */
        }
-       /* else if(card==XD_CARD)
-       {
-               RTS51X_WRITE_REG(chip, CARD_PWR_CTL,
-                       mask|LDO3318_PWR_MASK, val1|LDO_SUSPEND);
-               //RTS51X_WRITE_REG(chip, CARD_PWR_CTL,
-               //      LDO3318_PWR_MASK, LDO_SUSPEND);
-       } */
        else {
 #endif
                RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask, val1);
@@ -855,17 +846,6 @@ int card_power_on(struct rts51x_chip *chip, u8 card)
        return STATUS_SUCCESS;
 }
 
-int card_power_off(struct rts51x_chip *chip, u8 card)
-{
-       u8 mask, val;
-
-       mask = POWER_MASK;
-       val = POWER_OFF;
-       RTS51X_WRITE_REG(chip, CARD_PWR_CTL, mask, val);
-
-       return STATUS_SUCCESS;
-}
-
 int monitor_card_cd(struct rts51x_chip *chip, u8 card)
 {
        int retval;