Skip to content

Commit b625f93

Browse files
Jiri Slaby (SUSE)KAGA-KOKO
authored andcommitted
sh: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter. Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW). [ 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 bf9935e commit b625f93

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

arch/sh/boards/mach-se/7343/irq.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ static void __init se7343_domain_init(void)
4747
{
4848
int i;
4949

50-
se7343_irq_domain = irq_domain_add_linear(NULL, SE7343_FPGA_IRQ_NR,
51-
&irq_domain_simple_ops, NULL);
50+
se7343_irq_domain = irq_domain_create_linear(NULL, SE7343_FPGA_IRQ_NR,
51+
&irq_domain_simple_ops,
52+
NULL);
5253
if (unlikely(!se7343_irq_domain)) {
5354
printk("Failed to get IRQ domain\n");
5455
return;

arch/sh/boards/mach-se/7722/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void __init se7722_domain_init(void)
4646
{
4747
int i;
4848

49-
se7722_irq_domain = irq_domain_add_linear(NULL, SE7722_FPGA_IRQ_NR,
49+
se7722_irq_domain = irq_domain_create_linear(NULL, SE7722_FPGA_IRQ_NR,
5050
&irq_domain_simple_ops, NULL);
5151
if (unlikely(!se7722_irq_domain)) {
5252
printk("Failed to get IRQ domain\n");

arch/sh/boards/mach-x3proto/gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ int __init x3proto_gpio_setup(void)
108108
if (unlikely(ret))
109109
goto err_gpio;
110110

111-
x3proto_irq_domain = irq_domain_add_linear(NULL, NR_BASEBOARD_GPIOS,
111+
x3proto_irq_domain = irq_domain_create_linear(NULL, NR_BASEBOARD_GPIOS,
112112
&x3proto_gpio_irq_ops, NULL);
113113
if (unlikely(!x3proto_irq_domain))
114114
goto err_irq;

drivers/sh/intc/irqdomain.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ void __init intc_irq_domain_init(struct intc_desc_int *d,
5959
* tree penalty for linear cases with non-zero hwirq bases.
6060
*/
6161
if (irq_base == 0 && irq_end == (irq_base + hw->nr_vectors - 1))
62-
d->domain = irq_domain_add_linear(NULL, hw->nr_vectors,
63-
&intc_evt_ops, NULL);
62+
d->domain = irq_domain_create_linear(NULL, hw->nr_vectors, &intc_evt_ops, NULL);
6463
else
65-
d->domain = irq_domain_add_tree(NULL, &intc_evt_ops, NULL);
64+
d->domain = irq_domain_create_tree(NULL, &intc_evt_ops, NULL);
6665

6766
BUG_ON(!d->domain);
6867
}

0 commit comments

Comments
 (0)