at91: kernel v5.15: copy config and patches from 5.10

[openwrt/openwrt.git] / target / linux / at91 / patches-5.15 / 191-i2c-at91-remove-define-CONFIG_PM.patch

diff --git a/target/linux/at91/patches-5.15/191-i2c-at91-remove-define-CONFIG_PM.patch b/target/linux/at91/patches-5.15/191-i2c-at91-remove-define-CONFIG_PM.patch
new file mode 100644 (file)
index 0000000..27ee1b6
--- /dev/null
+++ b/target/linux/at91/patches-5.15/191-i2c-at91-remove-define-CONFIG_PM.patch
@@ -0,0 +1,76 @@
+From 023a6b46536dce41f2c5a7425826fc4da4509b8f Mon Sep 17 00:00:00 2001
+From: Claudiu Beznea <claudiu.beznea@microchip.com>
+Date: Mon, 5 Jul 2021 15:15:16 +0300
+Subject: [PATCH 191/247] i2c: at91: remove #define CONFIG_PM
+
+Remove #define CONFIG_PM and use __maybe_unused for PM functions and
+pm_ptr() for PM ops.
+
+Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
+Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+---
+ drivers/i2c/busses/i2c-at91-core.c | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+--- a/drivers/i2c/busses/i2c-at91-core.c
++++ b/drivers/i2c/busses/i2c-at91-core.c
+@@ -286,9 +286,7 @@ static int at91_twi_remove(struct platfo
+       return 0;
+ }
+ 
+-#ifdef CONFIG_PM
+-
+-static int at91_twi_runtime_suspend(struct device *dev)
++static int __maybe_unused at91_twi_runtime_suspend(struct device *dev)
+ {
+       struct at91_twi_dev *twi_dev = dev_get_drvdata(dev);
+ 
+@@ -299,7 +297,7 @@ static int at91_twi_runtime_suspend(stru
+       return 0;
+ }
+ 
+-static int at91_twi_runtime_resume(struct device *dev)
++static int __maybe_unused at91_twi_runtime_resume(struct device *dev)
+ {
+       struct at91_twi_dev *twi_dev = dev_get_drvdata(dev);
+ 
+@@ -308,7 +306,7 @@ static int at91_twi_runtime_resume(struc
+       return clk_prepare_enable(twi_dev->clk);
+ }
+ 
+-static int at91_twi_suspend_noirq(struct device *dev)
++static int __maybe_unused at91_twi_suspend_noirq(struct device *dev)
+ {
+       if (!pm_runtime_status_suspended(dev))
+               at91_twi_runtime_suspend(dev);
+@@ -316,7 +314,7 @@ static int at91_twi_suspend_noirq(struct
+       return 0;
+ }
+ 
+-static int at91_twi_resume_noirq(struct device *dev)
++static int __maybe_unused at91_twi_resume_noirq(struct device *dev)
+ {
+       struct at91_twi_dev *twi_dev = dev_get_drvdata(dev);
+       int ret;
+@@ -342,11 +340,6 @@ static const struct dev_pm_ops at91_twi_
+       .runtime_resume         = at91_twi_runtime_resume,
+ };
+ 
+-#define at91_twi_pm_ops (&at91_twi_pm)
+-#else
+-#define at91_twi_pm_ops NULL
+-#endif
+-
+ static struct platform_driver at91_twi_driver = {
+       .probe          = at91_twi_probe,
+       .remove         = at91_twi_remove,
+@@ -354,7 +347,7 @@ static struct platform_driver at91_twi_d
+       .driver         = {
+               .name   = "at91_i2c",
+               .of_match_table = of_match_ptr(atmel_twi_dt_ids),
+-              .pm     = at91_twi_pm_ops,
++              .pm     = pm_ptr(&at91_twi_pm),
+       },
+ };
+