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>

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 900778421be69b22c05ff7fe5c8e8dbc6bd6917d..5f970550d44efac1b2cd36b583bcd48cdc6a0fe2 100644 (file)
--- 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 ccd8fb2cad522b6d967b05e760ce8634dcbf9106..5ce5a2c1a1f5f4ea6b64012eed52f3fe4d6f80ac 100644 (file)
--- 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;