* [PATCH] iommu/ipmmu-vmsa: Minor cleanups
@ 2024-02-05 16:43 Robin Murphy
2024-02-06 1:26 ` Yoshihiro Shimoda
2024-02-09 10:47 ` Joerg Roedel
0 siblings, 2 replies; 3+ messages in thread
From: Robin Murphy @ 2024-02-05 16:43 UTC (permalink / raw)
To: joro
Cc: will, iommu, linux-arm-kernel, geert+renesas,
yoshihiro.shimoda.uh, linux-renesas-soc
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@arm.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH] iommu/ipmmu-vmsa: Minor cleanups
2024-02-05 16:43 [PATCH] iommu/ipmmu-vmsa: Minor cleanups Robin Murphy
@ 2024-02-06 1:26 ` Yoshihiro Shimoda
2024-02-09 10:47 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Yoshihiro Shimoda @ 2024-02-06 1:26 UTC (permalink / raw)
To: Robin Murphy, joro
Cc: will, iommu, linux-arm-kernel, geert+renesas, linux-renesas-soc
> 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@arm.com>
Thank you for the patch!
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iommu/ipmmu-vmsa: Minor cleanups
2024-02-05 16:43 [PATCH] iommu/ipmmu-vmsa: Minor cleanups Robin Murphy
2024-02-06 1:26 ` Yoshihiro Shimoda
@ 2024-02-09 10:47 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Joerg Roedel @ 2024-02-09 10:47 UTC (permalink / raw)
To: Robin Murphy
Cc: will, iommu, linux-arm-kernel, geert+renesas,
yoshihiro.shimoda.uh, linux-renesas-soc
On Mon, Feb 05, 2024 at 04:43:27PM +0000, Robin Murphy wrote:
> 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@arm.com>
> ---
> drivers/iommu/ipmmu-vmsa.c | 15 ++++-----------
> 1 file changed, 4 insertions(+), 11 deletions(-)
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-09 10:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-05 16:43 [PATCH] iommu/ipmmu-vmsa: Minor cleanups Robin Murphy
2024-02-06 1:26 ` Yoshihiro Shimoda
2024-02-09 10:47 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).