ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

mmc: Revert "mmc: core: Allow mmc_start_host() synchronously detect a card"

Browse Source 
It has turned out that some mmc host drivers were not ready to deal with
this change. Let's fix those host drivers first, then we can give this a
new try.

Fixes: 2cc83bf7d4 (mmc: core: Allow mmc_start_host() synchronously detect a card)
Cc: Dennis Zhou <dennis@kernel.org>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reported-by: Biju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20230630120015.363982-1-ulf.hansson@linaro.org
This commit is contained in:
Ulf Hansson
2023-06-30 14:00:15 +02:00
parent e55e5df193
commit fa700d7349
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mmc/core/core.c
View File

@@ -2199,8 +2199,10 @@ int mmc_card_alternative_gpt_sector(struct mmc_card *card, sector_t *gpt_sector)
} }
EXPORT_SYMBOL(mmc_card_alternative_gpt_sector); EXPORT_SYMBOL(mmc_card_alternative_gpt_sector);
static void __mmc_rescan(struct mmc_host *host) void mmc_rescan(struct work_struct *work)
{ {
struct mmc_host *host =
container_of(work, struct mmc_host, detect.work);
int i; int i;
if (host->rescan_disable) if (host->rescan_disable)
@@ -2272,14 +2274,6 @@ static void __mmc_rescan(struct mmc_host *host)
mmc_schedule_delayed_work(&host->detect, HZ); mmc_schedule_delayed_work(&host->detect, HZ);
} }
void mmc_rescan(struct work_struct *work)
{
struct mmc_host *host =
container_of(work, struct mmc_host, detect.work);
__mmc_rescan(host);
}
void mmc_start_host(struct mmc_host *host) void mmc_start_host(struct mmc_host *host)
{ {
host->f_init = max(min(freqs[0], host->f_max), host->f_min); host->f_init = max(min(freqs[0], host->f_max), host->f_min);
@@ -2292,8 +2286,7 @@ void mmc_start_host(struct mmc_host *host)
} }
mmc_gpiod_request_cd_irq(host); mmc_gpiod_request_cd_irq(host);
host->detect_change = 1; _mmc_detect_change(host, 0, false);
__mmc_rescan(host);
} }
void __mmc_stop_host(struct mmc_host *host) void __mmc_stop_host(struct mmc_host *host)