From aae92e8cea524023dce9154b519bbf7f127324fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Wed, 18 Apr 2018 17:27:25 +0200 Subject: [PATCH] staging: mt7621-mmc: Remove power callbacks from msdc_hw MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mt7621-mmc/board.h | 4 ---- drivers/staging/mt7621-mmc/sd.c | 10 ++-------- 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); } -- 2.11.0