summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lütke-Stetzkamp <christian@lkamp.de>2018-04-18 17:27:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-23 15:37:48 +0200
commitaae92e8cea524023dce9154b519bbf7f127324fe (patch)
tree82fc4462dafd69baa1a885615ad7a5ed0039a172
parentc65f33aaaa67f46bfe1db937c1df05402a500426 (diff)
downloadlinux-aae92e8cea524023dce9154b519bbf7f127324fe.tar.bz2
staging: mt7621-mmc: Remove power callbacks from msdc_hw
The ext_power_on|off fields of msdc_hw are never set, and only once checked for not being zero, so they can just be removed. Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/mt7621-mmc/board.h4
-rw-r--r--drivers/staging/mt7621-mmc/sd.c10
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/staging/mt7621-mmc/board.h b/drivers/staging/mt7621-mmc/board.h
index c4e014d01635..a60347cd3da8 100644
--- a/drivers/staging/mt7621-mmc/board.h
+++ b/drivers/staging/mt7621-mmc/board.h
@@ -64,10 +64,6 @@ struct msdc_hw {
/* config gpio pull mode */
void (*config_gpio_pin)(int type, int pull);
-
- /* external power control for card */
- void (*ext_power_on)(void);
- void (*ext_power_off)(void);
};
extern struct msdc_hw msdc0_hw;
diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 53866fda6bea..ae6e3dc53d09 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -771,16 +771,10 @@ static void msdc_card_power(struct msdc_host *host, int on)
if (on) {
msdc_pin_config(host, MSDC_PIN_PULL_UP);
- if (host->hw->ext_power_on)
- host->hw->ext_power_on();
- //else
- //msdc_vdd_on(host); // need todo card detection.
+ //msdc_vdd_on(host); // need todo card detection.
msleep(1);
} else {
- if (host->hw->ext_power_off)
- host->hw->ext_power_off();
- //else
- //msdc_vdd_off(host);
+ //msdc_vdd_off(host);
msdc_pin_config(host, MSDC_PIN_PULL_DOWN);
msleep(1);
}