]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
spi: at91-usart: drop dead runtime pm support
authorJohan Hovold <johan@kernel.org>
Wed, 29 Apr 2026 09:20:05 +0000 (11:20 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 4 May 2026 13:04:04 +0000 (22:04 +0900)
Drop the dead runtime PM support which has never been enabled.

Fixes: 96ed3ecde2c0 ("spi: at91-usart: add power management support")
Cc: Radu Pirea <radu_nicolae.pirea@upb.ro>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260429092005.166128-1-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-at91-usart.c

index 79edc1cd13c0f4010d9e6938dcad89561e2f63df..dce8796270919f74637ca79c580be4c14463edf4 100644 (file)
@@ -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>
 
@@ -576,38 +575,18 @@ at91_usart_spi_probe_fail:
        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;
 }
@@ -618,11 +597,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);
 
@@ -646,8 +625,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 = {