Commit 6f56023a authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents 2a394808 c0d638a0

drivers/mmc/core/block.c

+1 −1
Original line number Diff line number Diff line
@@ -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));



	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

		 * "Send Status".

drivers/mmc/host/mtk-sd.c

+4 −6
Original line number Diff line number Diff line
@@ -2683,7 +2683,6 @@ static int msdc_drv_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static void msdc_save_reg(struct msdc_host *host)

{

	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);

}



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 msdc_host *host = mmc_priv(mmc);
@@ -2752,7 +2751,7 @@ static int msdc_runtime_suspend(struct device *dev) 
	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 msdc_host *host = mmc_priv(mmc);
@@ -2762,7 +2761,7 @@ static int msdc_runtime_resume(struct device *dev) 
	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);

	int ret;
@@ -2776,11 +2775,10 @@ static int msdc_suspend(struct device *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);

}

#endif



static const struct dev_pm_ops msdc_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume)