[PATCH] iommu/ipmmu-vmsa: Minor cleanups

[Yoshihiro Shimoda]

> From: Robin Murphy, Sent: Tuesday, February 6, 2024 1:43 AM
> 
> Remove the of_match_ptr() which was supposed to have gone long ago, but
> managed to got lost in a fix-squashing mishap. On a similar theme, we
> may as well also modernise the PM ops to get rid of the clunky #ifdefs,
> and modernise the resource mapping to keep the checkpatch brigade happy.
> 
> Link: https://lore.kernel.org/linux-iommu/Yxni3d6CdI3FZ5D+@8bytes.org/
> Signed-off-by: Robin Murphy <robin.murphy at arm.com>

Thank you for the patch!

Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh at renesas.com>

Best regards,
Yoshihiro Shimoda

> ---
>  drivers/iommu/ipmmu-vmsa.c | 15 ++++-----------
>  1 file changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
> index ace1fc4bd34b..90d3f03242db 100644
> --- a/drivers/iommu/ipmmu-vmsa.c
> +++ b/drivers/iommu/ipmmu-vmsa.c
> @@ -1005,7 +1005,6 @@ static const struct of_device_id ipmmu_of_ids[] = {
>  static int ipmmu_probe(struct platform_device *pdev)
>  {
>  	struct ipmmu_vmsa_device *mmu;
> -	struct resource *res;
>  	int irq;
>  	int ret;
> 
> @@ -1025,8 +1024,7 @@ static int ipmmu_probe(struct platform_device *pdev)
>  		return ret;
> 
>  	/* Map I/O memory and request IRQ. */
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	mmu->base = devm_ioremap_resource(&pdev->dev, res);
> +	mmu->base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(mmu->base))
>  		return PTR_ERR(mmu->base);
> 
> @@ -1123,7 +1121,6 @@ static void ipmmu_remove(struct platform_device *pdev)
>  	ipmmu_device_reset(mmu);
>  }
> 
> -#ifdef CONFIG_PM_SLEEP
>  static int ipmmu_resume_noirq(struct device *dev)
>  {
>  	struct ipmmu_vmsa_device *mmu = dev_get_drvdata(dev);
> @@ -1153,18 +1150,14 @@ static int ipmmu_resume_noirq(struct device *dev)
>  }
> 
>  static const struct dev_pm_ops ipmmu_pm  = {
> -	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, ipmmu_resume_noirq)
> +	NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, ipmmu_resume_noirq)
>  };
> -#define DEV_PM_OPS	&ipmmu_pm
> -#else
> -#define DEV_PM_OPS	NULL
> -#endif /* CONFIG_PM_SLEEP */
> 
>  static struct platform_driver ipmmu_driver = {
>  	.driver = {
>  		.name = "ipmmu-vmsa",
> -		.of_match_table = of_match_ptr(ipmmu_of_ids),
> -		.pm = DEV_PM_OPS,
> +		.of_match_table = ipmmu_of_ids,
> +		.pm = pm_sleep_ptr(&ipmmu_pm),
>  	},
>  	.probe = ipmmu_probe,
>  	.remove_new = ipmmu_remove,
> --
> 2.39.2.101.g768bb238c484.dirty