| From 42818e0eaad81d5c85d703f9b1af1002379a6547 Mon Sep 17 00:00:00 2001 |
| From: Ulf Hansson <ulf.hansson@linaro.org> |
| Date: Fri, 30 Dec 2016 13:47:16 +0100 |
| Subject: [PATCH 140/255] mmc: sh_mmcif: Remove unused use_cd_gpio/cd_gpio from |
| platform data |
| |
| Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Reviewed-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit 95cc4df716a210a19f0611215c49484d460250fd) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mmcif.c | 6 ------ |
| include/linux/mmc/sh_mmcif.h | 2 -- |
| 2 files changed, 8 deletions(-) |
| |
| --- a/drivers/mmc/host/sh_mmcif.c |
| +++ b/drivers/mmc/host/sh_mmcif.c |
| @@ -1509,12 +1509,6 @@ static int sh_mmcif_probe(struct platfor |
| } |
| } |
| |
| - 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); |
| --- 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; |
