[PATCH 2/4] media: intel/ipu6: Switch to RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS

[Hidenori Kobayashi]

On Tue, Apr 30, 2024 at 12:55:34PM +0000, Ricardo Ribalda wrote:
> Replace the old helpers with its modern alternative.
> Now we do not need to set '__maybe_unused' annotations when we are not
> enabling the PM configurations.
> 
> Fixes:
> drivers/media/pci/intel/ipu6/ipu6.c:841:12: warning: ‘ipu6_runtime_resume’ defined but not used [-Wunused-function]
> drivers/media/pci/intel/ipu6/ipu6.c:806:12: warning: ‘ipu6_resume’ defined but not used [-Wunused-function]
> drivers/media/pci/intel/ipu6/ipu6.c:801:12: warning: ‘ipu6_suspend’ defined but not used [-Wunused-function]
> 
> Signed-off-by: Ricardo Ribalda <ribalda at chromium.org>
> ---
>  drivers/media/pci/intel/ipu6/ipu6.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/pci/intel/ipu6/ipu6.c b/drivers/media/pci/intel/ipu6/ipu6.c
> index 4b1f69d14d71..ff5ca0c52781 100644
> --- a/drivers/media/pci/intel/ipu6/ipu6.c
> +++ b/drivers/media/pci/intel/ipu6/ipu6.c
> @@ -803,7 +803,7 @@ static int ipu6_suspend(struct device *dev)
>  	return 0;
>  }
>  
> -static int ipu6_resume(struct device *dev)
> +static int __maybe_unused ipu6_resume(struct device *dev)

Doesn't this contradict your commit message?

>  {
>  	struct pci_dev *pdev = to_pci_dev(dev);
>  	struct ipu6_device *isp = pci_get_drvdata(pdev);
> @@ -860,8 +860,8 @@ static int ipu6_runtime_resume(struct device *dev)
>  }
>  
>  static const struct dev_pm_ops ipu6_pm_ops = {
> -	SET_SYSTEM_SLEEP_PM_OPS(&ipu6_suspend, &ipu6_resume)
> -	SET_RUNTIME_PM_OPS(&ipu6_suspend, &ipu6_runtime_resume, NULL)
> +	SYSTEM_SLEEP_PM_OPS(&ipu6_suspend, &ipu6_resume)
> +	RUNTIME_PM_OPS(&ipu6_suspend, &ipu6_runtime_resume, NULL)
>  };
>  
>  MODULE_DEVICE_TABLE(pci, ipu6_pci_tbl);
> 
> -- 
> 2.44.0.769.g3c40516874-goog
> 
>