Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 762333e3 authored by Christian Dietrich's avatar Christian Dietrich Committed by Linus Torvalds
Browse files

drivers/mmc/host/msm-sdcc: remove dead config options 



CONFIG_MMC_MSM7X00A_RESUME_IN_WQ and CONFIG_MMC_EMBEDDED_SDIO don't exist
in Kconfig and is never defined anywhere else, therefore removing all
references for it from the source code.

Signed-off-by: default avatarChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@codeaurora.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ed199f7e

drivers/mmc/host/msm_sdcc.c

+0 −25
Original line number Diff line number Diff line
@@ -1057,22 +1057,6 @@ msmsdcc_init_dma(struct msmsdcc_host *host) 
	return 0;

}



#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ

static void

do_resume_work(struct work_struct *work)

{

	struct msmsdcc_host *host =

		container_of(work, struct msmsdcc_host, resume_task);

	struct mmc_host	*mmc = host->mmc;



	if (mmc) {

		mmc_resume_host(mmc);

		if (host->stat_irq)

			enable_irq(host->stat_irq);

	}

}

#endif



static int

msmsdcc_probe(struct platform_device *pdev)

{
@@ -1145,15 +1129,6 @@ msmsdcc_probe(struct platform_device *pdev) 
	host->dmares = dmares;

	spin_lock_init(&host->lock);



#ifdef CONFIG_MMC_EMBEDDED_SDIO

	if (plat->embedded_sdio)

		mmc_set_embedded_sdio_data(mmc,

					   &plat->embedded_sdio->cis,

					   &plat->embedded_sdio->cccr,

					   plat->embedded_sdio->funcs,

					   plat->embedded_sdio->num_funcs);

#endif



	/*

	 * Setup DMA

	 */

drivers/mmc/host/msm_sdcc.h

+0 −4
Original line number Diff line number Diff line
@@ -235,10 +235,6 @@ struct msmsdcc_host { 
	int			cmdpoll;

	struct msmsdcc_stats	stats;



#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ

	struct work_struct	resume_task;

#endif



	/* Command parameters */

	unsigned int		cmd_timeout;

	unsigned int		cmd_pio_irqmask;