target/linux/at91/patches-5.10/191-i2c-at91-remove-define-CONFIG_PM.patch

   1 From 023a6b46536dce41f2c5a7425826fc4da4509b8f Mon Sep 17 00:00:00 2001
   2 From: Claudiu Beznea <claudiu.beznea@microchip.com>
   3 Date: Mon, 5 Jul 2021 15:15:16 +0300
   4 Subject: [PATCH 191/247] i2c: at91: remove #define CONFIG_PM
   5
   6 Remove #define CONFIG_PM and use __maybe_unused for PM functions and
   7 pm_ptr() for PM ops.
   8
   9 Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
  10 Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
  11 Signed-off-by: Wolfram Sang <wsa@kernel.org>
  12 ---
  13  drivers/i2c/busses/i2c-at91-core.c | 17 +++++------------
  14  1 file changed, 5 insertions(+), 12 deletions(-)
  15
  16 diff --git a/drivers/i2c/busses/i2c-at91-core.c b/drivers/i2c/busses/i2c-at91-core.c
  17 index e14edd236108..9f3c3e8e8011 100644
  18 --- a/drivers/i2c/busses/i2c-at91-core.c
  19 +++ b/drivers/i2c/busses/i2c-at91-core.c
  20 @@ -286,9 +286,7 @@ static int at91_twi_remove(struct platform_device *pdev)
  21         return 0;
  22  }
  23
  24 -#ifdef CONFIG_PM
  25 -
  26 -static int at91_twi_runtime_suspend(struct device *dev)
  27 +static int __maybe_unused at91_twi_runtime_suspend(struct device *dev)
  28  {
  29         struct at91_twi_dev *twi_dev = dev_get_drvdata(dev);
  30
  31 @@ -299,7 +297,7 @@ static int at91_twi_runtime_suspend(struct device *dev)
  32         return 0;
  33  }
  34
  35 -static int at91_twi_runtime_resume(struct device *dev)
  36 +static int __maybe_unused at91_twi_runtime_resume(struct device *dev)
  37  {
  38         struct at91_twi_dev *twi_dev = dev_get_drvdata(dev);
  39
  40 @@ -308,7 +306,7 @@ static int at91_twi_runtime_resume(struct device *dev)
  41         return clk_prepare_enable(twi_dev->clk);
  42  }
  43
  44 -static int at91_twi_suspend_noirq(struct device *dev)
  45 +static int __maybe_unused at91_twi_suspend_noirq(struct device *dev)
  46  {
  47         if (!pm_runtime_status_suspended(dev))
  48                 at91_twi_runtime_suspend(dev);
  49 @@ -316,7 +314,7 @@ static int at91_twi_suspend_noirq(struct device *dev)
  50         return 0;
  51  }
  52
  53 -static int at91_twi_resume_noirq(struct device *dev)
  54 +static int __maybe_unused at91_twi_resume_noirq(struct device *dev)
  55  {
  56         struct at91_twi_dev *twi_dev = dev_get_drvdata(dev);
  57         int ret;
  58 @@ -342,11 +340,6 @@ static const struct dev_pm_ops at91_twi_pm = {
  59         .runtime_resume         = at91_twi_runtime_resume,
  60  };
  61
  62 -#define at91_twi_pm_ops (&at91_twi_pm)
  63 -#else
  64 -#define at91_twi_pm_ops NULL
  65 -#endif
  66 -
  67  static struct platform_driver at91_twi_driver = {
  68         .probe          = at91_twi_probe,
  69         .remove         = at91_twi_remove,
  70 @@ -354,7 +347,7 @@ static struct platform_driver at91_twi_driver = {
  71         .driver         = {
  72                 .name   = "at91_i2c",
  73                 .of_match_table = of_match_ptr(atmel_twi_dt_ids),
  74 -               .pm     = at91_twi_pm_ops,
  75 +               .pm     = pm_ptr(&at91_twi_pm),
  76         },
  77  };
  78
  79 --
  80 2.32.0
  81