Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1ee8f3f authored by Wenyou Yang's avatar Wenyou Yang Committed by Mark Brown
Browse files

spi/atmel: improve the system suspend/resume functions implementation 



To make it cleaner, the system suspend/resume directly call
the runtime suspend/resume functions
and remove the wapper of CONFIG_PM_RUNTIME, CONFIG_PM_SLEEP.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Acked-by: default avatarKevin Hilman <khilman@linaro.org>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d0de6ff6

drivers/spi/spi-atmel.c

+26 −35
Original line number Diff line number Diff line
@@ -1451,11 +1451,30 @@ static int atmel_spi_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int atmel_spi_suspend(struct device *dev)

static int atmel_spi_runtime_suspend(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

	struct atmel_spi *as = spi_master_get_devdata(master);



	clk_disable_unprepare(as->clk);

	pinctrl_pm_select_sleep_state(dev);



	return 0;

}



static int atmel_spi_runtime_resume(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

	struct atmel_spi *as = spi_master_get_devdata(master);



	pinctrl_pm_select_default_state(dev);



	return clk_prepare_enable(as->clk);

}



static int atmel_spi_suspend(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

	int ret;



	/* Stop the queue running */
@@ -1465,10 +1484,8 @@ static int atmel_spi_suspend(struct device *dev) 
		return ret;

	}



	if (!pm_runtime_suspended(dev)) {

		clk_disable_unprepare(as->clk);

		pinctrl_pm_select_sleep_state(dev);

	}

	if (!pm_runtime_suspended(dev))

		atmel_spi_runtime_suspend(dev);



	return 0;

}
@@ -1476,12 +1493,10 @@ static int atmel_spi_suspend(struct device *dev) 
static int atmel_spi_resume(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

	struct atmel_spi	*as = spi_master_get_devdata(master);

	int ret;



	if (!pm_runtime_suspended(dev)) {

		pinctrl_pm_select_default_state(dev);

		ret = clk_prepare_enable(as->clk);

		ret = atmel_spi_runtime_resume(dev);

		if (ret)

			return ret;

	}
@@ -1493,30 +1508,6 @@ static int atmel_spi_resume(struct device *dev) 


	return ret;

}

#endif



#ifdef CONFIG_PM_RUNTIME

static int atmel_spi_runtime_suspend(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

	struct atmel_spi *as = spi_master_get_devdata(master);



	clk_disable_unprepare(as->clk);

	pinctrl_pm_select_sleep_state(dev);



	return 0;

}



static int atmel_spi_runtime_resume(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

	struct atmel_spi *as = spi_master_get_devdata(master);



	pinctrl_pm_select_default_state(dev);



	return clk_prepare_enable(as->clk);

}

#endif



static const struct dev_pm_ops atmel_spi_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(atmel_spi_suspend, atmel_spi_resume)