spi: at91-usart: drop dead runtime pm support
PATCH 1/1 spi: at91-usart: drop dead runtime pm support
Drop the dead runtime PM support which has never been enabled.
--- drivers/spi/spi-at91-usart.c | 39 ++++++++---------------------------- 1 file changed, 8 insertions(+), 31 deletions(-)
drivers/spi/spi-at91-usart.c +8 -31
@@ -16,7 +16,6 @@#include <linux/gpio/consumer.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> -#include <linux/pm_runtime.h> #include <linux/spi/spi.h>
@@ -572,38 +571,18 @@ static int at91_usart_spi_probe(struct platform_device *pdev)return ret; } -__maybe_unused static int at91_usart_spi_runtime_suspend (struct device *dev) -{ -struct spi_controller *ctlr =dev_get_drvdata (dev); -struct at91_usart_spi *aus =spi_controller_get_devdata (ctlr); - -clk_disable_unprepare (aus->clk); -pinctrl_pm_select_sleep_state (dev); - -return 0 ; -} - -__maybe_unused static int at91_usart_spi_runtime_resume (struct device *dev) -{ -struct spi_controller *ctrl =dev_get_drvdata (dev); -struct at91_usart_spi *aus =spi_controller_get_devdata (ctrl); - -pinctrl_pm_select_default_state (dev); - -return clk_prepare_enable (aus->clk); -} -__maybe_unused static int at91_usart_spi_suspend (struct device *dev) {struct spi_controller *ctrl =dev_get_drvdata (dev); +struct at91_usart_spi *aus =spi_controller_get_devdata (ctrl);int ret; ret =spi_controller_suspend (ctrl);if (ret)return ret; -if (!pm_runtime_suspended (dev)) -at91_usart_spi_runtime_suspend (dev); +clk_disable_unprepare (aus->clk); +pinctrl_pm_select_sleep_state (dev);return 0 ; }
@@ -614,11 +593,11 @@ __maybe_unused static int at91_usart_spi_resume(struct device *dev)struct at91_usart_spi *aus =spi_controller_get_devdata (ctrl);int ret; -if (!pm_runtime_suspended (dev)) { - ret =at91_usart_spi_runtime_resume (dev); -if (ret) -return ret; - } +pinctrl_pm_select_default_state (dev); + + ret =clk_prepare_enable (aus->clk); +if (ret) +return ret;at91_usart_spi_init (aus);
@@ -638,8 +617,6 @@ static void at91_usart_spi_remove(struct platform_device *pdev)static const struct dev_pm_ops at91_usart_spi_pm_ops = {SET_SYSTEM_SLEEP_PM_OPS (at91_usart_spi_suspend, at91_usart_spi_resume) -SET_RUNTIME_PM_OPS (at91_usart_spi_runtime_suspend, - at91_usart_spi_runtime_resume,NULL ) };static struct platform_driver at91_usart_spi_driver = {
Signature · 1 line
2.53.0
Mark Brown
maintainerQuoted 1 line · Johan Hovold
spi: at91-usart: drop dead runtime pm support
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-7.2
Thanks!
[1/1] spi: at91-usart: drop dead runtime pm support
https://git.kernel.org/broonie/sound/c/ae4ccd216dd3
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark