From 95cc4df716a210a19f0611215c49484d460250fd Mon Sep 17 00:00:00 2001 From: Ulf Hansson Date: Fri, 30 Dec 2016 13:47:16 +0100 Subject: [PATCH] mmc: sh_mmcif: Remove unused use_cd_gpio/cd_gpio from platform data Cc: Kuninori Morimoto Signed-off-by: Ulf Hansson Reviewed-by: Linus Walleij --- drivers/mmc/host/sh_mmcif.c | 6 ------ include/linux/mmc/sh_mmcif.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 900778421be6..5f970550d44e 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1509,12 +1509,6 @@ static int sh_mmcif_probe(struct platform_device *pdev) } } - if (pd && pd->use_cd_gpio) { - ret = mmc_gpio_request_cd(mmc, pd->cd_gpio, 0); - if (ret < 0) - goto err_clk; - } - mutex_init(&host->thread_lock); ret = mmc_add_host(mmc); diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index ccd8fb2cad52..5ce5a2c1a1f5 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h @@ -35,10 +35,8 @@ struct sh_mmcif_plat_data { int (*get_cd)(struct platform_device *pdef); unsigned int slave_id_tx; /* embedded slave_id_[tr]x */ unsigned int slave_id_rx; - bool use_cd_gpio : 1; bool ccs_unsupported : 1; bool clk_ctrl2_present : 1; - unsigned int cd_gpio; u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */ unsigned long caps; u32 ocr; -- 2.20.1