Commit 5957eeba authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 95cc4df7

drivers/mmc/host/sh_mmcif.c

+1 −17
Original line number Diff line number Diff line
@@ -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)

include/linux/mmc/sh_mmcif.h

+0 −1
Original line number Diff line number Diff line
@@ -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;