From: Wolfram Sang Date: Tue, 1 Apr 2025 09:58:40 +0000 (+0200) Subject: mmc: rename mmc_can_poweroff_notify() to mmc_card_can_poweroff_notify() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d872c26741b6448abc948895056157c17251a944;p=users%2Fdwmw2%2Flinux.git mmc: rename mmc_can_poweroff_notify() to mmc_card_can_poweroff_notify() mmc_can_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'card'. Signed-off-by: Wolfram Sang Link: https://lore.kernel.org/r/20250401095847.29271-5-wsa+renesas@sang-engineering.com Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index c45e12c046c15..7c6a0a79b7cf1 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2013,7 +2013,7 @@ out_release: return err; } -static bool mmc_can_poweroff_notify(const struct mmc_card *card) +static bool mmc_card_can_poweroff_notify(const struct mmc_card *card) { return card && mmc_card_mmc(card) && @@ -2136,7 +2136,7 @@ static int _mmc_suspend(struct mmc_host *host, enum mmc_poweroff_type pm_type) if (err) goto out; - if (mmc_can_poweroff_notify(host->card) && + if (mmc_card_can_poweroff_notify(host->card) && mmc_host_can_poweroff_notify(host, pm_type)) err = mmc_poweroff_notify(host->card, notify_type); else if (mmc_can_sleep(host->card)) @@ -2217,7 +2217,7 @@ static int mmc_shutdown(struct mmc_host *host) * the sleep-cmd (CMD5), we may need to re-initialize it first, to allow * us to send the preferred poweroff-notification cmd at shutdown. */ - if (mmc_can_poweroff_notify(host->card) && + if (mmc_card_can_poweroff_notify(host->card) && !mmc_host_can_poweroff_notify(host, MMC_POWEROFF_SUSPEND)) err = _mmc_resume(host);