mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-14 06:35:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fixes' into next

Browse source
This commit is contained in:
Ulf Hansson 2020-12-04 15:36:56 +01:00
commit 6f56023aea
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mmc/core/block.c
View file

@ -580,7 +580,7 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
memcpy(&(idata->ic.response), cmd.resp, sizeof(cmd.resp)); memcpy(&(idata->ic.response), cmd.resp, sizeof(cmd.resp));
if (idata->rpmb || (cmd.flags & MMC_RSP_R1B)) { if (idata->rpmb || (cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) {
/* /*
* Ensure RPMB/R1B command has completed by polling CMD13 * Ensure RPMB/R1B command has completed by polling CMD13
* "Send Status". * "Send Status".

10
drivers/mmc/host/mtk-sd.c
View file

@ -2683,7 +2683,6 @@ static int msdc_drv_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM
static void msdc_save_reg(struct msdc_host *host) static void msdc_save_reg(struct msdc_host *host)
{ {
u32 tune_reg = host->dev_comp->pad_tune_reg; u32 tune_reg = host->dev_comp->pad_tune_reg;
@ -2742,7 +2741,7 @@ static void msdc_restore_reg(struct msdc_host *host)
__msdc_enable_sdio_irq(host, 1); __msdc_enable_sdio_irq(host, 1);
} }
static int msdc_runtime_suspend(struct device *dev) static int __maybe_unused msdc_runtime_suspend(struct device *dev)
{ {
struct mmc_host *mmc = dev_get_drvdata(dev); struct mmc_host *mmc = dev_get_drvdata(dev);
struct msdc_host *host = mmc_priv(mmc); struct msdc_host *host = mmc_priv(mmc);
@ -2752,7 +2751,7 @@ static int msdc_runtime_suspend(struct device *dev)
return 0; return 0;
} }
static int msdc_runtime_resume(struct device *dev) static int __maybe_unused msdc_runtime_resume(struct device *dev)
{ {
struct mmc_host *mmc = dev_get_drvdata(dev); struct mmc_host *mmc = dev_get_drvdata(dev);
struct msdc_host *host = mmc_priv(mmc); struct msdc_host *host = mmc_priv(mmc);
@ -2762,7 +2761,7 @@ static int msdc_runtime_resume(struct device *dev)
return 0; return 0;
} }
static int msdc_suspend(struct device *dev) static int __maybe_unused msdc_suspend(struct device *dev)
{ {
struct mmc_host *mmc = dev_get_drvdata(dev); struct mmc_host *mmc = dev_get_drvdata(dev);
int ret; int ret;
@ -2776,11 +2775,10 @@ static int msdc_suspend(struct device *dev)
return pm_runtime_force_suspend(dev); return pm_runtime_force_suspend(dev);
} }
static int msdc_resume(struct device *dev) static int __maybe_unused msdc_resume(struct device *dev)
{ {
return pm_runtime_force_resume(dev); return pm_runtime_force_resume(dev);
} }
#endif
static const struct dev_pm_ops msdc_dev_pm_ops = { static const struct dev_pm_ops msdc_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume) SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume)