[PATCH v2 01/57] irqdomain: um: use irq_domain_create_linear() helper

Jiri Slaby (SUSE) posted 57 patches 9 months ago
[PATCH v2 01/57] irqdomain: um: use irq_domain_create_linear() helper
Posted by Jiri Slaby (SUSE) 9 months ago
um_pci_init() open-codes what the irq_domain_create_linear() helper
does already. Use the helper instead of open-coding it.

This needs retval checking modification.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-um@lists.infradead.org

[v2]
This is new in v2.
---
 arch/um/drivers/virt-pci.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c
index dd5580f975cc..efe8b474c07b 100644
--- a/arch/um/drivers/virt-pci.c
+++ b/arch/um/drivers/virt-pci.c
@@ -1000,11 +1000,6 @@ static struct resource virt_platform_resource = {
 
 static int __init um_pci_init(void)
 {
-	struct irq_domain_info inner_domain_info = {
-		.size		= MAX_MSI_VECTORS,
-		.hwirq_max	= MAX_MSI_VECTORS,
-		.ops		= &um_pci_inner_domain_ops,
-	};
 	int err, i;
 
 	WARN_ON(logic_iomem_add_region(&virt_cfgspace_resource,
@@ -1030,10 +1025,10 @@ static int __init um_pci_init(void)
 		goto free;
 	}
 
-	inner_domain_info.fwnode = um_pci_fwnode;
-	um_pci_inner_domain = irq_domain_instantiate(&inner_domain_info);
-	if (IS_ERR(um_pci_inner_domain)) {
-		err = PTR_ERR(um_pci_inner_domain);
+	um_pci_inner_domain = irq_domain_create_linear(um_pci_fwnode, MAX_MSI_VECTORS,
+						       &um_pci_inner_domain_ops, NULL);
+	if (!um_pci_inner_domain) {
+		err = -ENOMEM;
 		goto free;
 	}
 
@@ -1070,7 +1065,7 @@ static int __init um_pci_init(void)
 		goto free;
 	return 0;
 free:
-	if (!IS_ERR_OR_NULL(um_pci_inner_domain))
+	if (um_pci_inner_domain)
 		irq_domain_remove(um_pci_inner_domain);
 	if (um_pci_fwnode)
 		irq_domain_free_fwnode(um_pci_fwnode);
-- 
2.49.0
Re: [PATCH v2 01/57] irqdomain: um: use irq_domain_create_linear() helper
Posted by Jiri Slaby 8 months, 2 weeks ago
@UM maintainers: if you have not read 00/57 [1], please route this 
through your tree.

[1] https://lore.kernel.org/all/20250319092951.37667-1-jirislaby@kernel.org/

Thanks.

On 19. 03. 25, 10:28, Jiri Slaby (SUSE) wrote:
> um_pci_init() open-codes what the irq_domain_create_linear() helper
> does already. Use the helper instead of open-coding it.
> 
> This needs retval checking modification.
> 
> Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Cc: linux-um@lists.infradead.org
> 
> [v2]
> This is new in v2.
> ---
>   arch/um/drivers/virt-pci.c | 15 +++++----------
>   1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c
> index dd5580f975cc..efe8b474c07b 100644
> --- a/arch/um/drivers/virt-pci.c
> +++ b/arch/um/drivers/virt-pci.c
> @@ -1000,11 +1000,6 @@ static struct resource virt_platform_resource = {
>   
>   static int __init um_pci_init(void)
>   {
> -	struct irq_domain_info inner_domain_info = {
> -		.size		= MAX_MSI_VECTORS,
> -		.hwirq_max	= MAX_MSI_VECTORS,
> -		.ops		= &um_pci_inner_domain_ops,
> -	};
>   	int err, i;
>   
>   	WARN_ON(logic_iomem_add_region(&virt_cfgspace_resource,
> @@ -1030,10 +1025,10 @@ static int __init um_pci_init(void)
>   		goto free;
>   	}
>   
> -	inner_domain_info.fwnode = um_pci_fwnode;
> -	um_pci_inner_domain = irq_domain_instantiate(&inner_domain_info);
> -	if (IS_ERR(um_pci_inner_domain)) {
> -		err = PTR_ERR(um_pci_inner_domain);
> +	um_pci_inner_domain = irq_domain_create_linear(um_pci_fwnode, MAX_MSI_VECTORS,
> +						       &um_pci_inner_domain_ops, NULL);
> +	if (!um_pci_inner_domain) {
> +		err = -ENOMEM;
>   		goto free;
>   	}
>   
> @@ -1070,7 +1065,7 @@ static int __init um_pci_init(void)
>   		goto free;
>   	return 0;
>   free:
> -	if (!IS_ERR_OR_NULL(um_pci_inner_domain))
> +	if (um_pci_inner_domain)
>   		irq_domain_remove(um_pci_inner_domain);
>   	if (um_pci_fwnode)
>   		irq_domain_free_fwnode(um_pci_fwnode);


-- 
js
suse labs
[tip: irq/cleanups] um: Use irq_domain_create_linear() helper
Posted by tip-bot2 for Jiri Slaby (SUSE) 7 months, 2 weeks ago
The following commit has been merged into the irq/cleanups branch of tip:

Commit-ID:     48199713a6a8115172534a2c4d23ec15938e8af5
Gitweb:        https://git.kernel.org/tip/48199713a6a8115172534a2c4d23ec15938e8af5
Author:        Jiri Slaby (SUSE) <jirislaby@kernel.org>
AuthorDate:    Wed, 19 Mar 2025 10:28:54 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 06 May 2025 14:59:03 +02:00

um: Use irq_domain_create_linear() helper

um_pci_init() open-codes what the irq_domain_create_linear() helper
does already. Use the helper instead of open-coding it.

[ tglx: Fix up subject prefix ]

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250319092951.37667-2-jirislaby@kernel.org
---
 arch/um/drivers/virt-pci.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c
index b83b5a7..0fe207c 100644
--- a/arch/um/drivers/virt-pci.c
+++ b/arch/um/drivers/virt-pci.c
@@ -538,11 +538,6 @@ void um_pci_platform_device_unregister(struct um_pci_device *dev)
 
 static int __init um_pci_init(void)
 {
-	struct irq_domain_info inner_domain_info = {
-		.size		= MAX_MSI_VECTORS,
-		.hwirq_max	= MAX_MSI_VECTORS,
-		.ops		= &um_pci_inner_domain_ops,
-	};
 	int err, i;
 
 	WARN_ON(logic_iomem_add_region(&virt_cfgspace_resource,
@@ -564,10 +559,10 @@ static int __init um_pci_init(void)
 		goto free;
 	}
 
-	inner_domain_info.fwnode = um_pci_fwnode;
-	um_pci_inner_domain = irq_domain_instantiate(&inner_domain_info);
-	if (IS_ERR(um_pci_inner_domain)) {
-		err = PTR_ERR(um_pci_inner_domain);
+	um_pci_inner_domain = irq_domain_create_linear(um_pci_fwnode, MAX_MSI_VECTORS,
+						       &um_pci_inner_domain_ops, NULL);
+	if (!um_pci_inner_domain) {
+		err = -ENOMEM;
 		goto free;
 	}
 
@@ -602,7 +597,7 @@ static int __init um_pci_init(void)
 	return 0;
 
 free:
-	if (!IS_ERR_OR_NULL(um_pci_inner_domain))
+	if (um_pci_inner_domain)
 		irq_domain_remove(um_pci_inner_domain);
 	if (um_pci_fwnode)
 		irq_domain_free_fwnode(um_pci_fwnode);