Skip to content

Commit 0b4b172

Browse files
hcodinaKAGA-KOKO
authored andcommitted
irqdomain: Remove __irq_domain_add()
__irq_domain_add() has been replaced by irq_domain_instanciate() and so, it is no more used. Simply remove it. Signed-off-by: Herve Codina <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent a701f8e commit 0b4b172

File tree

2 files changed

+1
-38
lines changed

2 files changed

+1
-38
lines changed

include/linux/irqdomain.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ enum {
184184
/* Irq domain is hierarchical */
185185
IRQ_DOMAIN_FLAG_HIERARCHY = (1 << 0),
186186

187-
/* Irq domain name was allocated in __irq_domain_add() */
187+
/* Irq domain name was allocated internally */
188188
IRQ_DOMAIN_NAME_ALLOCATED = (1 << 1),
189189

190190
/* Irq domain is an IPI domain with virq per cpu */
@@ -307,10 +307,6 @@ struct irq_domain *irq_domain_instantiate(const struct irq_domain_info *info);
307307
struct irq_domain *devm_irq_domain_instantiate(struct device *dev,
308308
const struct irq_domain_info *info);
309309

310-
struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, unsigned int size,
311-
irq_hw_number_t hwirq_max, int direct_max,
312-
const struct irq_domain_ops *ops,
313-
void *host_data);
314310
struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode,
315311
unsigned int size,
316312
unsigned int first_irq,

kernel/irq/irqdomain.c

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -317,39 +317,6 @@ struct irq_domain *irq_domain_instantiate(const struct irq_domain_info *info)
317317
}
318318
EXPORT_SYMBOL_GPL(irq_domain_instantiate);
319319

320-
/**
321-
* __irq_domain_add() - Allocate a new irq_domain data structure
322-
* @fwnode: firmware node for the interrupt controller
323-
* @size: Size of linear map; 0 for radix mapping only
324-
* @hwirq_max: Maximum number of interrupts supported by controller
325-
* @direct_max: Maximum value of direct maps; Use ~0 for no limit; 0 for no
326-
* direct mapping
327-
* @ops: domain callbacks
328-
* @host_data: Controller private data pointer
329-
*
330-
* Allocates and initializes an irq_domain structure.
331-
* Returns pointer to IRQ domain, or NULL on failure.
332-
*/
333-
struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, unsigned int size,
334-
irq_hw_number_t hwirq_max, int direct_max,
335-
const struct irq_domain_ops *ops,
336-
void *host_data)
337-
{
338-
struct irq_domain_info info = {
339-
.fwnode = fwnode,
340-
.size = size,
341-
.hwirq_max = hwirq_max,
342-
.direct_max = direct_max,
343-
.ops = ops,
344-
.host_data = host_data,
345-
};
346-
struct irq_domain *d;
347-
348-
d = irq_domain_instantiate(&info);
349-
return IS_ERR(d) ? NULL : d;
350-
}
351-
EXPORT_SYMBOL_GPL(__irq_domain_add);
352-
353320
/**
354321
* irq_domain_remove() - Remove an irq domain.
355322
* @domain: domain to remove

0 commit comments

Comments
 (0)