Commit 178422c2 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.0rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.1.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 1e63d297 e7afa79a

drivers/firmware/arm_scmi/scmi_pm_domain.c

+0 −26
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/err.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/pm_clock.h>

#include <linux/pm_domain.h>

#include <linux/scmi_protocol.h>
@@ -53,27 +52,6 @@ static int scmi_pd_power_off(struct generic_pm_domain *domain) 
	return scmi_pd_power(domain, false);

}



static int scmi_pd_attach_dev(struct generic_pm_domain *pd, struct device *dev)

{

	int ret;



	ret = pm_clk_create(dev);

	if (ret)

		return ret;



	ret = of_pm_clk_add_clks(dev);

	if (ret >= 0)

		return 0;



	pm_clk_destroy(dev);

	return ret;

}



static void scmi_pd_detach_dev(struct generic_pm_domain *pd, struct device *dev)

{

	pm_clk_destroy(dev);

}



static int scmi_pm_domain_probe(struct scmi_device *sdev)

{

	int num_domains, i;
@@ -124,10 +102,6 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) 
		scmi_pd->genpd.name = scmi_pd->name;

		scmi_pd->genpd.power_off = scmi_pd_power_off;

		scmi_pd->genpd.power_on = scmi_pd_power_on;

		scmi_pd->genpd.attach_dev = scmi_pd_attach_dev;

		scmi_pd->genpd.detach_dev = scmi_pd_detach_dev;

		scmi_pd->genpd.flags = GENPD_FLAG_PM_CLK |

				       GENPD_FLAG_ACTIVE_WAKEUP;



		pm_genpd_init(&scmi_pd->genpd, NULL,

			      state == SCMI_POWER_STATE_GENERIC_OFF);

drivers/mmc/host/mmc_hsq.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static void mmc_hsq_pump_requests(struct mmc_hsq *hsq) 
	spin_lock_irqsave(&hsq->lock, flags);



	/* Make sure we are not already running a request now */

	if (hsq->mrq) {

	if (hsq->mrq || hsq->recovery_halt) {

		spin_unlock_irqrestore(&hsq->lock, flags);

		return;

	}