Skip to content

Commit 813da4f

Browse files
Jiri Slaby (SUSE)KAGA-KOKO
authored andcommitted
powerpc: Switch irq_domain_add_nomap() to use fwnode
All irq_domain_add_*() functions are going away. PowerPC is the only user of irq_domain_add_nomap() and there is no irq_domain_create_nomap() complement. Therefore, to align with the rest of the kernel, rename irq_domain_add_nomap() to irq_domain_create_nomap() and accept a fwnode_handle instead of a device_node. [ tglx: Fix up subject prefix ] Signed-off-by: Jiri Slaby (SUSE) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent 29dea33 commit 813da4f

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Documentation/core-api/irq/irq-domain.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ No Map
141141

142142
::
143143

144-
irq_domain_add_nomap()
144+
irq_domain_create_nomap()
145145

146146
The No Map mapping is to be used when the hwirq number is
147147
programmable in the hardware. In this case it is best to program the

Documentation/translations/zh_CN/core-api/irq/irq-domain.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ irq_domain_add_tree()和irq_domain_create_tree()在功能上是等价的,除
124124

125125
::
126126

127-
irq_domain_add_nomap()
127+
irq_domain_create_nomap()
128128

129129
当硬件中的hwirq号是可编程的时候,就可以采用无映射类型。 在这种情况下,最好将
130130
Linux IRQ号编入硬件本身,这样就不需要映射了。 调用irq_create_direct_mapping()

arch/powerpc/platforms/powermac/smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static int __init psurge_secondary_ipi_init(void)
190190
{
191191
int rc = -ENOMEM;
192192

193-
psurge_host = irq_domain_add_nomap(NULL, ~0, &psurge_host_ops, NULL);
193+
psurge_host = irq_domain_create_nomap(NULL, ~0, &psurge_host_ops, NULL);
194194

195195
if (psurge_host)
196196
psurge_secondary_virq = irq_create_direct_mapping(psurge_host);

arch/powerpc/platforms/ps3/interrupt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ void __init ps3_init_IRQ(void)
743743
unsigned cpu;
744744
struct irq_domain *host;
745745

746-
host = irq_domain_add_nomap(NULL, PS3_PLUG_MAX + 1, &ps3_host_ops, NULL);
746+
host = irq_domain_create_nomap(NULL, PS3_PLUG_MAX + 1, &ps3_host_ops, NULL);
747747
irq_set_default_domain(host);
748748

749749
for_each_possible_cpu(cpu) {

include/linux/irqdomain.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,13 +431,13 @@ static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_no
431431
}
432432

433433
#ifdef CONFIG_IRQ_DOMAIN_NOMAP
434-
static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_node,
434+
static inline struct irq_domain *irq_domain_create_nomap(struct fwnode_handle *fwnode,
435435
unsigned int max_irq,
436436
const struct irq_domain_ops *ops,
437437
void *host_data)
438438
{
439439
struct irq_domain_info info = {
440-
.fwnode = of_fwnode_handle(of_node),
440+
.fwnode = fwnode,
441441
.hwirq_max = max_irq,
442442
.direct_max = max_irq,
443443
.ops = ops,

0 commit comments

Comments
 (0)