superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

irqdomain: Drop of_node_to_fwnode() 

All uses of of_node_to_fwnode() in non-irqdomain code were changed to
"officially" defined of_fwnode_handle(). Therefore, the former can be
dropped along with the last uses in the irqdomain code.

Due to merge logistics the inline cannot be dropped immediately. Move it to
a deprecated section, which will be removed during the merge window.

[ tglx: Handle merge logistics ]

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-12-jirislaby@kernel.org
pull/1250/head
Jiri Slaby (SUSE) 2025-03-19 10:29:04 +01:00 committed by Thomas Gleixner
parent b712918091
commit e847a847ae
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/linux/irqdomain.h
View File

@ -358,11 +358,6 @@ int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,
irq_hw_number_t hwirq, int node, irq_hw_number_t hwirq, int node,
const struct irq_affinity_desc *affinity); const struct irq_affinity_desc *affinity);
static inline struct fwnode_handle *of_node_to_fwnode(struct device_node *node)
{
return node ? &node->fwnode : NULL;
}
extern const struct fwnode_operations irqchip_fwnode_ops; extern const struct fwnode_operations irqchip_fwnode_ops;
static inline bool is_fwnode_irqchip(const struct fwnode_handle *fwnode) static inline bool is_fwnode_irqchip(const struct fwnode_handle *fwnode)
@ -387,7 +382,7 @@ struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,
static inline struct irq_domain *irq_find_matching_host(struct device_node *node, static inline struct irq_domain *irq_find_matching_host(struct device_node *node,
enum irq_domain_bus_token bus_token) enum irq_domain_bus_token bus_token)
{ {
return irq_find_matching_fwnode(of_node_to_fwnode(node), bus_token); return irq_find_matching_fwnode(of_fwnode_handle(node), bus_token);
} }
static inline struct irq_domain *irq_find_host(struct device_node *node) static inline struct irq_domain *irq_find_host(struct device_node *node)
@ -407,7 +402,7 @@ static inline struct irq_domain *irq_domain_add_simple(struct device_node *of_no
const struct irq_domain_ops *ops, const struct irq_domain_ops *ops,
void *host_data) void *host_data)
{ {
return irq_domain_create_simple(of_node_to_fwnode(of_node), size, first_irq, ops, host_data); return irq_domain_create_simple(of_fwnode_handle(of_node), size, first_irq, ops, host_data);
} }
/** /**
@ -423,7 +418,7 @@ static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_no
void *host_data) void *host_data)
{ {
struct irq_domain_info info = { struct irq_domain_info info = {
.fwnode = of_node_to_fwnode(of_node), .fwnode = of_fwnode_handle(of_node),
.size = size, .size = size,
.hwirq_max = size, .hwirq_max = size,
.ops = ops, .ops = ops,
@ -442,7 +437,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nod
void *host_data) void *host_data)
{ {
struct irq_domain_info info = { struct irq_domain_info info = {
.fwnode = of_node_to_fwnode(of_node), .fwnode = of_fwnode_handle(of_node),
.hwirq_max = max_irq, .hwirq_max = max_irq,
.direct_max = max_irq, .direct_max = max_irq,
.ops = ops, .ops = ops,
@ -462,7 +457,7 @@ static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node
void *host_data) void *host_data)
{ {
struct irq_domain_info info = { struct irq_domain_info info = {
.fwnode = of_node_to_fwnode(of_node), .fwnode = of_fwnode_handle(of_node),
.hwirq_max = ~0U, .hwirq_max = ~0U,
.ops = ops, .ops = ops,
.host_data = host_data, .host_data = host_data,
@ -611,7 +606,7 @@ static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *par
void *host_data) void *host_data)
{ {
return irq_domain_create_hierarchy(parent, flags, size, return irq_domain_create_hierarchy(parent, flags, size,
of_node_to_fwnode(node), of_fwnode_handle(node),
ops, host_data); ops, host_data);
} }
@ -755,6 +750,12 @@ static inline void msi_device_domain_free_wired(struct irq_domain *domain, unsig
} }
#endif #endif
/* Deprecated functions. Will be removed in the merge window */
static inline struct fwnode_handle *of_node_to_fwnode(struct device_node *node)
{
return node ? &node->fwnode : NULL;
}
#else /* CONFIG_IRQ_DOMAIN */ #else /* CONFIG_IRQ_DOMAIN */
static inline void irq_dispose_mapping(unsigned int virq) { } static inline void irq_dispose_mapping(unsigned int virq) { }
static inline struct irq_domain *irq_find_matching_fwnode( static inline struct irq_domain *irq_find_matching_fwnode(

4
kernel/irq/irqdomain.c
View File

@ -502,7 +502,7 @@ struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,
const struct irq_domain_ops *ops, const struct irq_domain_ops *ops,
void *host_data) void *host_data)
{ {
return irq_domain_create_legacy(of_node_to_fwnode(of_node), size, return irq_domain_create_legacy(of_fwnode_handle(of_node), size,
first_irq, first_hwirq, ops, host_data); first_irq, first_hwirq, ops, host_data);
} }
EXPORT_SYMBOL_GPL(irq_domain_add_legacy); EXPORT_SYMBOL_GPL(irq_domain_add_legacy);
@ -885,7 +885,7 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args,
{ {
int i; int i;
fwspec->fwnode = of_node_to_fwnode(np); fwspec->fwnode = of_fwnode_handle(np);
fwspec->param_count = count; fwspec->param_count = count;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)