mmc: sdhci: Allow override of mmc host operations (bf60e592) · Commits · 戴 / test

In the past, fixes for specific hardware devices were implemented in sdhci using quirks. That approach is no longer accepted because the growing number of quirks was starting to make the code difficult to understand and maintain. One alternative to quirks, is to allow drivers to override the default mmc host operations. This patch makes it easy to do that, and it is needed for a subsequent bug fix, for which separate patches are provided. Signed-off-by:

Adrian Hunter <adrian.hunter@intel.com> Cc: stable@vger.kernel.org # v4.4+ Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/sdhci.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2849,6 +2849,8 @@ struct sdhci_host sdhci_alloc_host(struct device dev,

		host = mmc_priv(mmc);
		host->mmc = mmc;
		host->mmc_host_ops = sdhci_ops;
		mmc->ops = &host->mmc_host_ops;

		return host;
		}
		@@ -3037,7 +3039,6 @@ int sdhci_add_host(struct sdhci_host *host)
		/*
		* Set host parameters.
		*/
		mmc->ops = &sdhci_ops;
		max_clk = host->max_clk;

		if (host->ops->get_min_clock)

drivers/mmc/host/sdhci.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -430,6 +430,7 @@ struct sdhci_host {

		/* Internal data */
		struct mmc_host mmc; / MMC structure */
		struct mmc_host_ops mmc_host_ops; /* MMC host ops */
		u64 dma_mask; /* custom DMA mask */

		#if defined(CONFIG_LEDS_CLASS) \|\| defined(CONFIG_LEDS_CLASS_MODULE)

Admin message