[RESEND] irq/irq_sim: shrink devm_irq_domain_create_sim()
diff mbox series

Message ID 20210301142659.8971-1-brgl@bgdev.pl
State In Next
Commit 11120ec67fb9a78cf30263b21aab475aec348d96
Headers show
Series
  • [RESEND] irq/irq_sim: shrink devm_irq_domain_create_sim()
Related show

Commit Message

Bartosz Golaszewski March 1, 2021, 2:26 p.m. UTC
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

We don't have to use a custom devres structure if all we manage is a
single pointer - we can use devm_add_action_or_reset() for that and
shrink the code a bit.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 kernel/irq/irq_sim.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

Comments

Bartosz Golaszewski March 16, 2021, 9:53 a.m. UTC | #1
On Mon, Mar 1, 2021 at 3:27 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>
> From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
>
> We don't have to use a custom devres structure if all we manage is a
> single pointer - we can use devm_add_action_or_reset() for that and
> shrink the code a bit.
>
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
>  kernel/irq/irq_sim.c | 31 ++++++++++++-------------------
>  1 file changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c
> index 48006608baf0..ee40a84641e5 100644
> --- a/kernel/irq/irq_sim.c
> +++ b/kernel/irq/irq_sim.c
> @@ -24,10 +24,6 @@ struct irq_sim_irq_ctx {
>         struct irq_sim_work_ctx *work_ctx;
>  };
>
> -struct irq_sim_devres {
> -       struct irq_domain       *domain;
> -};
> -
>  static void irq_sim_irqmask(struct irq_data *data)
>  {
>         struct irq_sim_irq_ctx *irq_ctx = irq_data_get_irq_chip_data(data);
> @@ -216,11 +212,11 @@ void irq_domain_remove_sim(struct irq_domain *domain)
>  }
>  EXPORT_SYMBOL_GPL(irq_domain_remove_sim);
>
> -static void devm_irq_domain_release_sim(struct device *dev, void *res)
> +static void devm_irq_domain_remove_sim(void *data)
>  {
> -       struct irq_sim_devres *this = res;
> +       struct irq_domain *domain = data;
>
> -       irq_domain_remove_sim(this->domain);
> +       irq_domain_remove_sim(domain);
>  }
>
>  /**
> @@ -238,20 +234,17 @@ struct irq_domain *devm_irq_domain_create_sim(struct device *dev,
>                                               struct fwnode_handle *fwnode,
>                                               unsigned int num_irqs)
>  {
> -       struct irq_sim_devres *dr;
> +       struct irq_domain *domain;
> +       int ret;
>
> -       dr = devres_alloc(devm_irq_domain_release_sim,
> -                         sizeof(*dr), GFP_KERNEL);
> -       if (!dr)
> -               return ERR_PTR(-ENOMEM);
> +       domain = irq_domain_create_sim(fwnode, num_irqs);
> +       if (IS_ERR(domain))
> +               return domain;
>
> -       dr->domain = irq_domain_create_sim(fwnode, num_irqs);
> -       if (IS_ERR(dr->domain)) {
> -               devres_free(dr);
> -               return dr->domain;
> -       }
> +       ret = devm_add_action_or_reset(dev, devm_irq_domain_remove_sim, domain);
> +       if (!ret)
> +               return ERR_PTR(ret);
>
> -       devres_add(dev, dr);
> -       return dr->domain;
> +       return domain;
>  }
>  EXPORT_SYMBOL_GPL(devm_irq_domain_create_sim);
> --
> 2.29.1
>

Gentle ping.

Bartosz

Patch
diff mbox series

diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c
index 48006608baf0..ee40a84641e5 100644
--- a/kernel/irq/irq_sim.c
+++ b/kernel/irq/irq_sim.c
@@ -24,10 +24,6 @@  struct irq_sim_irq_ctx {
 	struct irq_sim_work_ctx	*work_ctx;
 };
 
-struct irq_sim_devres {
-	struct irq_domain	*domain;
-};
-
 static void irq_sim_irqmask(struct irq_data *data)
 {
 	struct irq_sim_irq_ctx *irq_ctx = irq_data_get_irq_chip_data(data);
@@ -216,11 +212,11 @@  void irq_domain_remove_sim(struct irq_domain *domain)
 }
 EXPORT_SYMBOL_GPL(irq_domain_remove_sim);
 
-static void devm_irq_domain_release_sim(struct device *dev, void *res)
+static void devm_irq_domain_remove_sim(void *data)
 {
-	struct irq_sim_devres *this = res;
+	struct irq_domain *domain = data;
 
-	irq_domain_remove_sim(this->domain);
+	irq_domain_remove_sim(domain);
 }
 
 /**
@@ -238,20 +234,17 @@  struct irq_domain *devm_irq_domain_create_sim(struct device *dev,
 					      struct fwnode_handle *fwnode,
 					      unsigned int num_irqs)
 {
-	struct irq_sim_devres *dr;
+	struct irq_domain *domain;
+	int ret;
 
-	dr = devres_alloc(devm_irq_domain_release_sim,
-			  sizeof(*dr), GFP_KERNEL);
-	if (!dr)
-		return ERR_PTR(-ENOMEM);
+	domain = irq_domain_create_sim(fwnode, num_irqs);
+	if (IS_ERR(domain))
+		return domain;
 
-	dr->domain = irq_domain_create_sim(fwnode, num_irqs);
-	if (IS_ERR(dr->domain)) {
-		devres_free(dr);
-		return dr->domain;
-	}
+	ret = devm_add_action_or_reset(dev, devm_irq_domain_remove_sim, domain);
+	if (!ret)
+		return ERR_PTR(ret);
 
-	devres_add(dev, dr);
-	return dr->domain;
+	return domain;
 }
 EXPORT_SYMBOL_GPL(devm_irq_domain_create_sim);