summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-12-18 15:44:30 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2015-01-19 09:56:15 +0100
commitd30656e59a483af7eb04eccd4b0b00f00daa959e (patch)
tree6e2e4b4f465b914e971bfd03340dbaac03e1a3ed /drivers
parentmmc: core: Return error at failure of request CD/WP in mmc_of_parse() (diff)
downloadlinux-d30656e59a483af7eb04eccd4b0b00f00daa959e.tar.xz
linux-d30656e59a483af7eb04eccd4b0b00f00daa959e.zip
mmc: mvsdio: Remove redundant use of mmc_gpio_free_cd|ro()
The MMC core makes use of the devm_* functions while requesting the CD/WP GPIOs, let's rely on that. Cc: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/mvsdio.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 4f8618f4522d..b6ec91fb2fd5 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -828,8 +828,6 @@ static int mvsd_probe(struct platform_device *pdev)
out:
if (mmc) {
- mmc_gpio_free_cd(mmc);
- mmc_gpio_free_ro(mmc);
if (!IS_ERR(host->clk))
clk_disable_unprepare(host->clk);
mmc_free_host(mmc);
@@ -844,8 +842,6 @@ static int mvsd_remove(struct platform_device *pdev)
struct mvsd_host *host = mmc_priv(mmc);
- mmc_gpio_free_cd(mmc);
- mmc_gpio_free_ro(mmc);
mmc_remove_host(mmc);
del_timer_sync(&host->timer);
mvsd_power_down(host);