A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 20:33:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "mmc: sdhci-msm: Always set max_busy_timeout as zero"

Browse source
This commit is contained in:
qctecmdr 2021-01-22 13:46:43 -08:00 • committed by Gerrit - the friendly Code Review server
commit 0ef96ce882
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/mmc/host/sdhci-msm.c
View file

@ -1675,6 +1675,16 @@ static void sdhci_msm_set_uhs_signaling(struct sdhci_host *host,
sdhci_msm_hs400(host, &mmc->ios);
}
/*
* Ensure larger discard size by always setting max_busy_timeout to zero.
* This will always return max_busy_timeout as zero to the sdhci layer.
*/
static unsigned int sdhci_msm_get_max_timeout_count(struct sdhci_host *host)
{
return 0;
}
#define MAX_PROP_SIZE 32
static int sdhci_msm_dt_parse_vreg_info(struct device *dev,
struct sdhci_msm_reg_data **vreg_data, const char *vreg_name)
@ -3456,7 +3466,7 @@ static const struct sdhci_ops sdhci_msm_ops = {
.get_max_clock = sdhci_msm_get_max_clock,
.set_bus_width = sdhci_set_bus_width,
.set_uhs_signaling = sdhci_msm_set_uhs_signaling,
.get_max_timeout_count = sdhci_msm_get_max_timeout_count,
#if defined(CONFIG_SDC_QTI)
.dump_vendor_regs = sdhci_msm_dump_vendor_regs,
#endif
@ -4417,12 +4427,6 @@ static int sdhci_msm_probe(struct platform_device *pdev)
goto pm_runtime_disable;
sdhci_msm_set_regulator_caps(msm_host);
/*
* Ensure larger discard size by setting max_busy_timeout.
* This has to set only after sdhci_add_host so that our
* value won't be over-written.
*/
host->mmc->max_busy_timeout = 0;
#if defined(CONFIG_SDC_QTI)
sdhci_msm_init_sysfs(pdev);
#endif