priv->syswake_irq = irq;
 
        /* Set up an IRQ domain */
-       priv->domain = irq_domain_create_linear(of_fwnode_handle(node), 16, &irq_generic_chip_ops,
-                                            priv);
+       priv->domain = irq_domain_create_linear(dev_fwnode(&pdev->dev), 16, &irq_generic_chip_ops,
+                                               priv);
        if (unlikely(!priv->domain)) {
                dev_err(&pdev->dev, "cannot add IRQ domain\n");
                return -ENOMEM;
 
        /* steer all IRQs into configured channel */
        writel_relaxed(BIT(data->channel), data->regs + CHANCTRL);
 
-       data->domain = irq_domain_create_linear(of_fwnode_handle(np), data->reg_num * 32,
-                                            &imx_irqsteer_domain_ops, data);
+       data->domain = irq_domain_create_linear(dev_fwnode(&pdev->dev), data->reg_num * 32,
+                                               &imx_irqsteer_domain_ops, data);
        if (!data->domain) {
                dev_err(&pdev->dev, "failed to create IRQ domain\n");
                ret = -ENOMEM;
 
        kirq->chip.irq_mask     = keystone_irq_setmask;
        kirq->chip.irq_unmask   = keystone_irq_unmask;
 
-       kirq->irqd = irq_domain_create_linear(of_fwnode_handle(np), KEYSTONE_N_IRQ,
-                                             &keystone_irq_ops, kirq);
+       kirq->irqd = irq_domain_create_linear(dev_fwnode(dev), KEYSTONE_N_IRQ, &keystone_irq_ops,
+                                             kirq);
        if (!kirq->irqd) {
                dev_err(dev, "IRQ domain registration failed\n");
                return -ENODEV;
 
                return -EINVAL;
        }
 
-       pic->domain = irq_domain_create_linear(of_fwnode_handle(node), PIC_MAX_IRQS,
+       pic->domain = irq_domain_create_linear(dev_fwnode(&pdev->dev), PIC_MAX_IRQS,
                                               &mvebu_pic_domain_ops, pic);
        if (!pic->domain) {
                dev_err(&pdev->dev, "Failed to allocate irq domain\n");
 
 
        mutex_init(&intc->lock);
 
-       intc->domain = irq_domain_create_linear(of_fwnode_handle(dev->of_node), max_system_events,
+       intc->domain = irq_domain_create_linear(dev_fwnode(dev), max_system_events,
                                                &pruss_intc_irq_domain_ops, intc);
        if (!intc->domain)
                return -ENOMEM;
 
        irq_chip->irq_set_wake = intc_irqpin_irq_set_wake;
        irq_chip->flags = IRQCHIP_MASK_ON_SUSPEND;
 
-       p->irq_domain = irq_domain_create_simple(of_fwnode_handle(dev->of_node),
-                                                nirqs, 0,
-                                                &intc_irqpin_irq_domain_ops,
-                                                p);
+       p->irq_domain = irq_domain_create_simple(dev_fwnode(dev), nirqs, 0,
+                                                &intc_irqpin_irq_domain_ops, p);
        if (!p->irq_domain) {
                ret = -ENXIO;
                dev_err(dev, "cannot initialize irq domain\n");
 
 
        p->cpu_int_base = p->iomem + IRQC_INT_CPU_BASE(0); /* SYS-SPI */
 
-       p->irq_domain = irq_domain_create_linear(of_fwnode_handle(dev->of_node), p->number_of_irqs,
+       p->irq_domain = irq_domain_create_linear(dev_fwnode(dev), p->number_of_irqs,
                                                 &irq_generic_chip_ops, p);
        if (!p->irq_domain) {
                ret = -ENXIO;
 
        priv->chip.irq_set_type = rza1_irqc_set_type;
        priv->chip.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE;
 
-       priv->irq_domain = irq_domain_create_hierarchy(parent, 0, IRQC_NUM_IRQ,
-                                                      of_fwnode_handle(np), &rza1_irqc_domain_ops,
-                                                      priv);
+       priv->irq_domain = irq_domain_create_hierarchy(parent, 0, IRQC_NUM_IRQ, dev_fwnode(dev),
+                                                      &rza1_irqc_domain_ops, priv);
        if (!priv->irq_domain) {
                dev_err(dev, "cannot initialize irq domain\n");
                ret = -ENOMEM;
 
 
        raw_spin_lock_init(&rzg2l_irqc_data->lock);
 
-       irq_domain = irq_domain_create_hierarchy(parent_domain, 0, IRQC_NUM_IRQ,
-                                                of_fwnode_handle(node), &rzg2l_irqc_domain_ops,
-                                                rzg2l_irqc_data);
+       irq_domain = irq_domain_create_hierarchy(parent_domain, 0, IRQC_NUM_IRQ, dev_fwnode(dev),
+                                                &rzg2l_irqc_domain_ops, rzg2l_irqc_data);
        if (!irq_domain) {
                pm_runtime_put(dev);
                return dev_err_probe(dev, -ENOMEM, "failed to add irq domain\n");
 
        raw_spin_lock_init(&rzv2h_icu_data->lock);
 
        irq_domain = irq_domain_create_hierarchy(parent_domain, 0, ICU_NUM_IRQ,
-                                                of_fwnode_handle(node), &rzv2h_icu_domain_ops,
+                                                dev_fwnode(&pdev->dev), &rzv2h_icu_domain_ops,
                                                 rzv2h_icu_data);
        if (!irq_domain) {
                dev_err(&pdev->dev, "failed to add irq domain\n");
 
        }
 
        domain = irq_domain_create_hierarchy(parent_domain, 0, drv_data->bank_nr * IRQS_PER_BANK,
-                                            of_fwnode_handle(np), &stm32mp_exti_domain_ops,
-                                            host_data);
-
+                                            dev_fwnode(dev), &stm32mp_exti_domain_ops, host_data);
        if (!domain) {
                dev_err(dev, "Could not register exti domain\n");
                return -ENOMEM;
 
        if (ret)
                return ret;
 
-       domain = irq_domain_create_linear(of_fwnode_handle(dev_of_node(dev)),
-                                         ti_sci_get_num_resources(inta->vint),
+       domain = irq_domain_create_linear(dev_fwnode(dev), ti_sci_get_num_resources(inta->vint),
                                          &ti_sci_inta_irq_domain_ops, inta);
        if (!domain) {
                dev_err(dev, "Failed to allocate IRQ domain\n");
 
                return PTR_ERR(intr->out_irqs);
        }
 
-       domain = irq_domain_create_hierarchy(parent_domain, 0, 0,
-                                            of_fwnode_handle(dev_of_node(dev)),
+       domain = irq_domain_create_hierarchy(parent_domain, 0, 0, dev_fwnode(dev),
                                             &ti_sci_intr_irq_domain_ops, intr);
        if (!domain) {
                dev_err(dev, "Failed to allocate IRQ domain\n");
 
                return -EINVAL;
        }
 
-       data->domain = irq_domain_create_linear(of_fwnode_handle(node), 8, &ts4800_ic_ops, data);
+       data->domain = irq_domain_create_linear(dev_fwnode(&pdev->dev), 8, &ts4800_ic_ops, data);
        if (!data->domain) {
                dev_err(&pdev->dev, "cannot add IRQ domain\n");
                return -ENOMEM;