diff options
| author | Ulf Hansson | 2016-12-30 13:47:17 +0100 |
|---|---|---|
| committer | Ulf Hansson | 2017-02-13 13:19:57 +0100 |
| commit | 5957eeba530747e9d77daf2f300a186758be51d9 (patch) | |
| tree | 46329f2d9faa4fe86901c20c1b44f7b0eb27ea44 | |
| parent | mmc: sh_mmcif: Remove unused use_cd_gpio/cd_gpio from platform data (diff) | |
| download | kernel-qcow2-linux-5957eeba530747e9d77daf2f300a186758be51d9.tar.gz kernel-qcow2-linux-5957eeba530747e9d77daf2f300a186758be51d9.tar.xz kernel-qcow2-linux-5957eeba530747e9d77daf2f300a186758be51d9.zip | |
mmc: sh_mmcif: Remove unused ->get_cd() platform callback
Removing the callback also enables us to remove the sh_mmcif_get_cd()
altogether, as we convert to use mmc_gpio_get_cd() to the same kind of
work.
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 18 | ||||
| -rw-r--r-- | include/linux/mmc/sh_mmcif.h | 1 |
2 files changed, 1 insertions, 18 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 5f970550d44e..7ba92a425ee0 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1079,26 +1079,10 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->state = STATE_IDLE; } -static int sh_mmcif_get_cd(struct mmc_host *mmc) -{ - struct sh_mmcif_host *host = mmc_priv(mmc); - struct device *dev = sh_mmcif_host_to_dev(host); - struct sh_mmcif_plat_data *p = dev->platform_data; - int ret = mmc_gpio_get_cd(mmc); - - if (ret >= 0) - return ret; - - if (!p || !p->get_cd) - return -ENOSYS; - else - return p->get_cd(host->pd); -} - static struct mmc_host_ops sh_mmcif_ops = { .request = sh_mmcif_request, .set_ios = sh_mmcif_set_ios, - .get_cd = sh_mmcif_get_cd, + .get_cd = mmc_gpio_get_cd, }; static bool sh_mmcif_end_cmd(struct sh_mmcif_host *host) diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index 5ce5a2c1a1f5..7cafc95a2b4e 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h @@ -32,7 +32,6 @@ */ 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 ccs_unsupported : 1; |