lkml.org 
[lkml]   [2020]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 4/6] irq/irq_sim: remove irq_domain_remove_sim()
Date
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Use the new remove() callback in irq_domain_ops to dispose of any
private data associated with the sim domain. This allows us to drop
the dedicated irq_domain_remove_sim() function and instead just use
the regular irq_domain_remove().

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/iio/dummy/iio_dummy_evgen.c | 2 +-
include/linux/irq_sim.h | 1 -
kernel/irq/irq_sim.c | 32 ++++++++++++-----------------
3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/drivers/iio/dummy/iio_dummy_evgen.c b/drivers/iio/dummy/iio_dummy_evgen.c
index 31c9e012abeb..47620bdae845 100644
--- a/drivers/iio/dummy/iio_dummy_evgen.c
+++ b/drivers/iio/dummy/iio_dummy_evgen.c
@@ -118,7 +118,7 @@ EXPORT_SYMBOL_GPL(iio_dummy_evgen_get_regs);

static void iio_dummy_evgen_free(void)
{
- irq_domain_remove_sim(iio_evgen->irq_sim_domain);
+ irq_domain_remove(iio_evgen->irq_sim_domain);
kfree(iio_evgen);
}

diff --git a/include/linux/irq_sim.h b/include/linux/irq_sim.h
index 26bf6164dcc7..90e910fa2f91 100644
--- a/include/linux/irq_sim.h
+++ b/include/linux/irq_sim.h
@@ -21,7 +21,6 @@ struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode,
struct irq_domain *devm_irq_domain_create_sim(struct device *dev,
struct fwnode_handle *fwnode,
unsigned int num_irqs);
-void irq_domain_remove_sim(struct irq_domain *domain);
void irq_sim_fire(int virq);

#endif /* _LINUX_IRQ_SIM_H */
diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c
index 575c1e3d32a9..a4400aed5fb2 100644
--- a/kernel/irq/irq_sim.c
+++ b/kernel/irq/irq_sim.c
@@ -108,9 +108,19 @@ static void irq_sim_domain_unmap(struct irq_domain *domain, unsigned int virq)
kfree(irq_ctx);
}

+static void irq_sim_domain_remove(struct irq_domain *domain)
+{
+ struct irq_sim_work_ctx *work_ctx = domain->host_data;
+
+ irq_work_sync(&work_ctx->work);
+ bitmap_free(work_ctx->pending);
+ kfree(work_ctx);
+}
+
static const struct irq_domain_ops irq_sim_domain_ops = {
.map = irq_sim_domain_map,
.unmap = irq_sim_domain_unmap,
+ .remove = irq_sim_domain_remove,
};

/**
@@ -122,6 +132,8 @@ static const struct irq_domain_ops irq_sim_domain_ops = {
*
* On success: return a new irq_domain object.
* On failure: a negative errno wrapped with ERR_PTR().
+ *
+ * The returned domain can be freed using irq_domain_remove().
*/
struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode,
unsigned int num_irqs)
@@ -156,29 +168,11 @@ struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode,
}
EXPORT_SYMBOL_GPL(irq_domain_create_sim);

-/**
- * irq_domain_remove_sim - Deinitialize the interrupt simulator domain: free
- * the interrupt descriptors and allocated memory.
- *
- * @domain: The interrupt simulator domain to tear down.
- */
-void irq_domain_remove_sim(struct irq_domain *domain)
-{
- struct irq_sim_work_ctx *work_ctx = domain->host_data;
-
- irq_work_sync(&work_ctx->work);
- bitmap_free(work_ctx->pending);
- kfree(work_ctx);
-
- irq_domain_remove(domain);
-}
-EXPORT_SYMBOL_GPL(irq_domain_remove_sim);
-
static void devm_irq_domain_release_sim(struct device *dev, void *res)
{
struct irq_sim_devres *this = res;

- irq_domain_remove_sim(this->domain);
+ irq_domain_remove(this->domain);
}

/**
--
2.25.0
\
 
 \ /
  Last update: 2020-02-11 14:13    [W:0.048 / U:0.680 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site