From nobody Thu Dec 18 13:45:30 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F42113DABFB for ; Wed, 15 Jan 2025 08:54:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736931268; cv=none; b=TP0JW7/HL7sgghp9HMNfZ6I+urCHOXg1yd1Y+or+zE2n/hMVykUsEoDnRShwPlZ1DpOMRbhzvFG1xUBcT3uBlzqEPY8UH3h7p65t+/+w9Qu7p0CqtpCVk8frqAPbqACkTbM/qJLjF3hzQCj6jm0jFer4VYBCDynj0nihG7oizrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736931268; c=relaxed/simple; bh=EbNzadu64HxeGBgN0Jtl3Wv9MMaxIUECjkOrPZ5ILJM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ePB9cHYOiw/JqiVxqVi37U0la9wHVDH78OFxGx613PbCq1wT5HAGFpzlBYLX0VbPuEJq2+w2ZXnGhKrHyQTu0uApnR9s6ywiXrEQudRSlftevHq+8gYPenu8LEK/i99q3jYtymVb8TT6zb0GVIGgbrUjy75o3xjWERFOkEjuNCg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Edsm7UUZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Edsm7UUZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93823C4CEE4; Wed, 15 Jan 2025 08:54:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736931267; bh=EbNzadu64HxeGBgN0Jtl3Wv9MMaxIUECjkOrPZ5ILJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Edsm7UUZfMyDgDUAOrwz29KV7duk60VHETETA7y8cx+tAM1sZ0hzNB73EI4E1yozt pC31fwaqWDdcdX45usrG4ZcYXV/7ODO0m6UAur1igylgVjrpJWCBmd1OMQ0zydFM+0 Or6SV43gLQ4zwlynC2vUcyMYmiSUvxIc6GfUUFjNVvFxUP5Og4MYzCxz8HNJi2sS9V icSIrytTteseEXdmp6GgTtDw14ZrUgcwaOqde5dk7gIhgpO/Oj9vTijAP+U4WgGml+ cMbReK9DpPZd51yKi2EwkwVTtYthvSoVayFIgORWbaskr6H1aIG37VW5l/g08z9nRw fnR3+TffpwBWw== From: "Jiri Slaby (SUSE)" To: tglx@linutronix.de Cc: maz@kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH 09/18] irqdomain: Rename _add functions to _add_*_of_node Date: Wed, 15 Jan 2025 09:53:58 +0100 Message-ID: <20250115085409.1629787-10-jirislaby@kernel.org> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250115085409.1629787-1-jirislaby@kernel.org> References: <20250115085409.1629787-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable For readers, it is very confusing that: * irq_domain_add_*() functions are dedicated to of_nodes, * irq_domain_create_*() ones to fwnodes, and * irq_domain_instantiate() to the universal struct irq_domain_info. Neither _create, nor _add designate any of those nodes. Despite the naming, the functionality of them is the same: add an irq domain (by generic irq_domain_instantiate()). So the source of the confusion is the naming proper -- making the distinction based on _create, _add, and _instantiate. Therefore, here an "_of_node" suffix is added to all "_add" functions (of_node ones). In the next patch, "_create" (fwnode ones) are switched to "_add_fwnode". And finally, "_instantiate" is renamed to "_add". So when all are applied, the interface is much easier to follow: * dom =3D irq_domain_add_linear_of_node(of_node, ...) * dom =3D irq_domain_add_linear_fwnode(fwnode, ...) * dom =3D irq_domain_add(info) * irq_domain_remove(dom) Signed-off-by: Jiri Slaby (SUSE) --- Note 1: I completely do not insist on these patches, but when I came as the first time reader, these occured to me as big misnomers. Note 2: irq_domain_add() might have been irq_domain_add_info() as well. That would make it consistent among the others. Opinions? --- Documentation/core-api/irq/irq-domain.rst | 62 ++++++++++--------- .../zh_CN/core-api/irq/irq-domain.rst | 24 +++---- arch/arc/kernel/intc-arcv2.c | 2 +- arch/arc/kernel/intc-compact.c | 2 +- arch/arc/kernel/mcip.c | 2 +- arch/arm/common/sa1111.c | 2 +- arch/arm/mach-exynos/suspend.c | 2 +- arch/arm/mach-imx/avic.c | 2 +- arch/arm/mach-imx/gpc.c | 2 +- arch/arm/mach-imx/tzic.c | 2 +- arch/arm/mach-omap1/irq.c | 2 +- arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- arch/arm/mach-pxa/irq.c | 2 +- arch/arm/plat-orion/gpio.c | 2 +- arch/mips/ath25/ar2315.c | 2 +- arch/mips/ath25/ar5312.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 12 ++-- arch/mips/lantiq/irq.c | 2 +- arch/mips/pci/pci-ar2315.c | 2 +- arch/mips/pci/pci-rt3883.c | 2 +- arch/mips/ralink/irq.c | 2 +- arch/nios2/kernel/irq.c | 2 +- arch/powerpc/platforms/44x/uic.c | 2 +- .../powerpc/platforms/512x/mpc5121_ads_cpld.c | 2 +- arch/powerpc/platforms/52xx/media5200.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 4 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- .../platforms/85xx/socrates_fpga_pic.c | 2 +- arch/powerpc/platforms/8xx/cpm1-ic.c | 2 +- arch/powerpc/platforms/8xx/pic.c | 2 +- arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 2 +- arch/powerpc/platforms/cell/spider-pic.c | 2 +- .../platforms/embedded6xx/flipper-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/powermac/smp.c | 2 +- arch/powerpc/platforms/powernv/opal-irqchip.c | 2 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/sysdev/cpm2_pic.c | 2 +- arch/powerpc/sysdev/ehv_pic.c | 2 +- arch/powerpc/sysdev/fsl_msi.c | 2 +- arch/powerpc/sysdev/ge/ge_pic.c | 2 +- arch/powerpc/sysdev/i8259.c | 2 +- arch/powerpc/sysdev/ipic.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/tsi108_pci.c | 2 +- arch/powerpc/sysdev/xive/common.c | 2 +- arch/sh/boards/mach-se/7343/irq.c | 2 +- arch/sh/boards/mach-se/7722/irq.c | 2 +- arch/sh/boards/mach-x3proto/gpio.c | 2 +- drivers/bus/moxtet.c | 2 +- drivers/edac/altera_edac.c | 2 +- drivers/gpio/gpio-brcmstb.c | 2 +- drivers/gpio/gpio-davinci.c | 2 +- drivers/gpio/gpio-em.c | 2 +- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-lpc18xx.c | 2 +- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-mxs.c | 2 +- drivers/gpio/gpio-pxa.c | 2 +- drivers/gpio/gpio-rockchip.c | 2 +- drivers/gpio/gpio-sa1100.c | 2 +- drivers/gpio/gpio-sodaville.c | 2 +- drivers/gpio/gpio-tb10x.c | 2 +- drivers/gpio/gpio-twl4030.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- drivers/gpu/drm/msm/msm_mdss.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 2 +- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- drivers/iio/adc/stm32-adc-core.c | 2 +- drivers/irqchip/exynos-combiner.c | 2 +- drivers/irqchip/irq-al-fic.c | 2 +- drivers/irqchip/irq-alpine-msi.c | 2 +- drivers/irqchip/irq-armada-370-xp.c | 4 +- drivers/irqchip/irq-aspeed-i2c-ic.c | 2 +- drivers/irqchip/irq-aspeed-intc.c | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 2 +- drivers/irqchip/irq-aspeed-vic.c | 2 +- drivers/irqchip/irq-ath79-misc.c | 4 +- drivers/irqchip/irq-atmel-aic-common.c | 2 +- drivers/irqchip/irq-bcm2835.c | 2 +- drivers/irqchip/irq-bcm2836.c | 2 +- drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-bcm7038-l1.c | 2 +- drivers/irqchip/irq-bcm7120-l2.c | 2 +- drivers/irqchip/irq-brcmstb-l2.c | 2 +- drivers/irqchip/irq-clps711x.c | 2 +- drivers/irqchip/irq-crossbar.c | 2 +- drivers/irqchip/irq-csky-apb-intc.c | 2 +- drivers/irqchip/irq-csky-mpintc.c | 2 +- drivers/irqchip/irq-davinci-cp-intc.c | 2 +- drivers/irqchip/irq-digicolor.c | 2 +- drivers/irqchip/irq-dw-apb-ictl.c | 2 +- drivers/irqchip/irq-ftintc010.c | 2 +- drivers/irqchip/irq-goldfish-pic.c | 2 +- drivers/irqchip/irq-hip04.c | 2 +- drivers/irqchip/irq-i8259.c | 2 +- drivers/irqchip/irq-idt3243x.c | 2 +- drivers/irqchip/irq-imgpdc.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 2 +- drivers/irqchip/irq-imx-intmux.c | 2 +- drivers/irqchip/irq-imx-irqsteer.c | 2 +- drivers/irqchip/irq-ingenic-tcu.c | 2 +- drivers/irqchip/irq-ingenic.c | 2 +- drivers/irqchip/irq-jcore-aic.c | 2 +- drivers/irqchip/irq-keystone.c | 2 +- drivers/irqchip/irq-lpc32xx.c | 2 +- drivers/irqchip/irq-ls-extirq.c | 2 +- drivers/irqchip/irq-ls-scfg-msi.c | 2 +- drivers/irqchip/irq-ls1x.c | 2 +- drivers/irqchip/irq-mchp-eic.c | 2 +- drivers/irqchip/irq-mips-cpu.c | 4 +- drivers/irqchip/irq-mips-gic.c | 4 +- drivers/irqchip/irq-mmp.c | 4 +- drivers/irqchip/irq-mscc-ocelot.c | 2 +- drivers/irqchip/irq-mst-intc.c | 2 +- drivers/irqchip/irq-mtk-cirq.c | 2 +- drivers/irqchip/irq-mtk-sysirq.c | 2 +- drivers/irqchip/irq-mvebu-pic.c | 2 +- drivers/irqchip/irq-mxs.c | 2 +- drivers/irqchip/irq-nvic.c | 2 +- drivers/irqchip/irq-omap-intc.c | 4 +- drivers/irqchip/irq-or1k-pic.c | 2 +- drivers/irqchip/irq-orion.c | 4 +- drivers/irqchip/irq-owl-sirq.c | 2 +- drivers/irqchip/irq-pic32-evic.c | 2 +- drivers/irqchip/irq-pruss-intc.c | 2 +- drivers/irqchip/irq-realtek-rtl.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +- drivers/irqchip/irq-renesas-irqc.c | 2 +- drivers/irqchip/irq-renesas-rza1.c | 2 +- drivers/irqchip/irq-renesas-rzg2l.c | 2 +- drivers/irqchip/irq-renesas-rzv2h.c | 2 +- drivers/irqchip/irq-sa11x0.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 2 +- drivers/irqchip/irq-sp7021-intc.c | 2 +- drivers/irqchip/irq-starfive-jh8100-intc.c | 2 +- drivers/irqchip/irq-stm32-exti.c | 2 +- drivers/irqchip/irq-stm32mp-exti.c | 2 +- drivers/irqchip/irq-sun4i.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 2 +- drivers/irqchip/irq-sunxi-nmi.c | 2 +- drivers/irqchip/irq-tb10x.c | 2 +- drivers/irqchip/irq-tegra.c | 2 +- drivers/irqchip/irq-ti-sci-inta.c | 2 +- drivers/irqchip/irq-ti-sci-intr.c | 2 +- drivers/irqchip/irq-ts4800.c | 2 +- drivers/irqchip/irq-versatile-fpga.c | 2 +- drivers/irqchip/irq-vf610-mscm-ir.c | 2 +- drivers/irqchip/irq-vic.c | 2 +- drivers/irqchip/irq-vt8500.c | 2 +- drivers/irqchip/irq-wpcm450-aic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 2 +- drivers/irqchip/irq-xtensa-mx.c | 4 +- drivers/irqchip/irq-xtensa-pic.c | 4 +- drivers/irqchip/irq-zevio.c | 2 +- drivers/irqchip/spear-shirq.c | 2 +- drivers/mailbox/qcom-ipcc.c | 2 +- drivers/memory/omap-gpmc.c | 2 +- drivers/mfd/88pm860x-core.c | 2 +- drivers/mfd/ab8500-core.c | 2 +- drivers/mfd/arizona-irq.c | 2 +- drivers/mfd/db8500-prcmu.c | 2 +- drivers/mfd/fsl-imx25-tsadc.c | 2 +- drivers/mfd/lp8788-irq.c | 2 +- drivers/mfd/max8925-core.c | 2 +- drivers/mfd/max8997-irq.c | 2 +- drivers/mfd/max8998-irq.c | 2 +- drivers/mfd/mt6358-irq.c | 2 +- drivers/mfd/mt6397-irq.c | 2 +- drivers/mfd/qcom-pm8xxx.c | 2 +- drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe.c | 2 +- drivers/mfd/tc3589x.c | 2 +- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mfd/twl6030-irq.c | 2 +- drivers/mfd/wm831x-irq.c | 4 +- drivers/mfd/wm8994-irq.c | 2 +- drivers/misc/hi6421v600-irq.c | 2 +- drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/dsa/microchip/ksz_ptp.c | 2 +- drivers/net/dsa/mt7530.c | 4 +- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- drivers/net/dsa/mv88e6xxx/global2.c | 2 +- drivers/net/dsa/qca/ar9331.c | 2 +- drivers/net/dsa/realtek/rtl8365mb.c | 2 +- drivers/net/dsa/realtek/rtl8366rb.c | 2 +- .../net/ethernet/wangxun/txgbe/txgbe_irq.c | 2 +- drivers/net/usb/lan78xx.c | 2 +- drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- drivers/pci/controller/dwc/pci-keystone.c | 2 +- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +- drivers/pci/controller/dwc/pcie-uniphier.c | 2 +- .../controller/mobiveil/pcie-mobiveil-host.c | 4 +- drivers/pci/controller/pci-aardvark.c | 6 +- drivers/pci/controller/pci-ftpci100.c | 2 +- drivers/pci/controller/pci-mvebu.c | 2 +- drivers/pci/controller/pci-xgene-msi.c | 2 +- drivers/pci/controller/pcie-altera-msi.c | 2 +- drivers/pci/controller/pcie-altera.c | 2 +- drivers/pci/controller/pcie-brcmstb.c | 2 +- drivers/pci/controller/pcie-iproc-msi.c | 2 +- drivers/pci/controller/pcie-mediatek-gen3.c | 4 +- drivers/pci/controller/pcie-mediatek.c | 2 +- drivers/pci/controller/pcie-rockchip-host.c | 2 +- drivers/pci/controller/pcie-xilinx-cpm.c | 4 +- drivers/pci/controller/pcie-xilinx-dma-pl.c | 6 +- drivers/pci/controller/pcie-xilinx-nwl.c | 4 +- drivers/pci/controller/pcie-xilinx.c | 2 +- drivers/pci/controller/plda/pcie-plda-host.c | 6 +- drivers/pinctrl/mediatek/mtk-eint.c | 2 +- drivers/pinctrl/pinctrl-at91-pio4.c | 2 +- drivers/pinctrl/pinctrl-single.c | 4 +- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 +- drivers/platform/x86/asus-tf103c-dock.c | 2 +- drivers/sh/intc/irqdomain.c | 4 +- drivers/soc/dove/pmu.c | 2 +- drivers/soc/fsl/qe/qe_ic.c | 2 +- drivers/soc/qcom/smp2p.c | 2 +- drivers/soc/qcom/smsm.c | 2 +- drivers/soc/tegra/pmc.c | 2 +- drivers/spmi/spmi-pmic-arb.c | 2 +- drivers/ssb/driver_gpio.c | 4 +- drivers/thermal/qcom/lmh.c | 2 +- drivers/thermal/tegra/soctherm.c | 2 +- include/linux/gpio/driver.h | 2 +- include/linux/irqdomain.h | 16 ++--- sound/soc/codecs/wcd937x.c | 2 +- sound/soc/codecs/wcd938x.c | 2 +- sound/soc/codecs/wcd939x.c | 2 +- 235 files changed, 316 insertions(+), 310 deletions(-) diff --git a/Documentation/core-api/irq/irq-domain.rst b/Documentation/core= -api/irq/irq-domain.rst index f88a6ee67a35..9a80112360d8 100644 --- a/Documentation/core-api/irq/irq-domain.rst +++ b/Documentation/core-api/irq/irq-domain.rst @@ -42,10 +42,11 @@ irq_domain usage =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 An interrupt controller driver creates and registers an irq_domain by -calling one of the irq_domain_add_*() or irq_domain_create_*() functions -(each mapping method has a different allocator function, more on that late= r). -The function will return a pointer to the irq_domain on success. The caller -must provide the allocator function with an irq_domain_ops structure. +calling one of the irq_domain_add_*_of_node() or irq_domain_create_*() +functions (each mapping method has a different allocator function, +more on that later). The function will return a pointer to the +irq_domain on success. The caller must provide the allocator function +with an irq_domain_ops structure. =20 In most cases, the irq_domain will begin empty without any mappings between hwirq and IRQ numbers. Mappings are added to the irq_domain @@ -92,7 +93,7 @@ Linear =20 :: =20 - irq_domain_add_linear() + irq_domain_add_linear_of_node() irq_domain_create_linear() =20 The linear reverse map maintains a fixed size table indexed by the @@ -105,10 +106,11 @@ map are fixed time lookup for IRQ numbers, and irq_de= scs are only allocated for in-use IRQs. The disadvantage is that the table must be as large as the largest possible hwirq number. =20 -irq_domain_add_linear() and irq_domain_create_linear() are functionally -equivalent, except for the first argument is different - the former -accepts an Open Firmware specific 'struct device_node', while the latter -accepts a more general abstraction 'struct fwnode_handle'. +irq_domain_add_linear_of_node() and irq_domain_create_linear() are +functionally equivalent, except for the first argument is different - +the former accepts an Open Firmware specific 'struct device_node', +while the latter accepts a more general abstraction 'struct +fwnode_handle'. =20 The majority of drivers should use the linear map. =20 @@ -117,7 +119,7 @@ Tree =20 :: =20 - irq_domain_add_tree() + irq_domain_add_tree_of_node() irq_domain_create_tree() =20 The irq_domain maintains a radix tree map from hwirq numbers to Linux @@ -129,10 +131,11 @@ since it doesn't need to allocate a table as large as= the largest hwirq number. The disadvantage is that hwirq to IRQ number lookup is dependent on how many entries are in the table. =20 -irq_domain_add_tree() and irq_domain_create_tree() are functionally -equivalent, except for the first argument is different - the former -accepts an Open Firmware specific 'struct device_node', while the latter -accepts a more general abstraction 'struct fwnode_handle'. +irq_domain_add_tree_of_node() and irq_domain_create_tree() are +functionally equivalent, except for the first argument is different - +the former accepts an Open Firmware specific 'struct device_node', +while the latter accepts a more general abstraction 'struct +fwnode_handle'. =20 Very few drivers should need this mapping. =20 @@ -141,7 +144,7 @@ No Map =20 :: =20 - irq_domain_add_nomap() + irq_domain_add_nomap_of_node() =20 The No Map mapping is to be used when the hwirq number is programmable in the hardware. In this case it is best to program the @@ -159,8 +162,8 @@ Legacy =20 :: =20 - irq_domain_add_simple() - irq_domain_add_legacy() + irq_domain_add_simple_of_node() + irq_domain_add_legacy_of_node() irq_domain_create_simple() irq_domain_create_legacy() =20 @@ -189,13 +192,15 @@ supported. For example, ISA controllers would use th= e legacy map for mapping Linux IRQs 0-15 so that existing ISA drivers get the correct IRQ numbers. =20 -Most users of legacy mappings should use irq_domain_add_simple() or -irq_domain_create_simple() which will use a legacy domain only if an IRQ r= ange -is supplied by the system and will otherwise use a linear domain mapping. -The semantics of this call are such that if an IRQ range is specified then +Most users of legacy mappings should use +irq_domain_add_simple_of_node() or irq_domain_create_simple() which +will use a legacy domain only if an IRQ range is supplied by the +system and will otherwise use a linear domain mapping. The semantics +of this call are such that if an IRQ range is specified then descriptors will be allocated on-the-fly for it, and if no range is -specified it will fall through to irq_domain_add_linear() or -irq_domain_create_linear() which means *no* irq descriptors will be alloca= ted. +specified it will fall through to irq_domain_add_linear_of_node() or +irq_domain_create_linear() which means *no* irq descriptors will be +allocated. =20 A typical use case for simple domains is where an irqchip provider is supporting both dynamic and static IRQ assignments. @@ -206,11 +211,12 @@ that the driver using the simple domain call irq_crea= te_mapping() before any irq_find_mapping() since the latter will actually work for the static IRQ assignment case. =20 -irq_domain_add_simple() and irq_domain_create_simple() as well as -irq_domain_add_legacy() and irq_domain_create_legacy() are functionally -equivalent, except for the first argument is different - the former -accepts an Open Firmware specific 'struct device_node', while the latter -accepts a more general abstraction 'struct fwnode_handle'. +irq_domain_add_simple_of_node() and irq_domain_create_simple() as well +as irq_domain_add_legacy_of_node() and irq_domain_create_legacy() are +functionally equivalent, except for the first argument is different - +the former accepts an Open Firmware specific 'struct device_node', +while the latter accepts a more general abstraction 'struct +fwnode_handle'. =20 Hierarchy IRQ domain -------------------- diff --git a/Documentation/translations/zh_CN/core-api/irq/irq-domain.rst b= /Documentation/translations/zh_CN/core-api/irq/irq-domain.rst index 9174fce12c1b..3fcd5b8d508d 100644 --- a/Documentation/translations/zh_CN/core-api/irq/irq-domain.rst +++ b/Documentation/translations/zh_CN/core-api/irq/irq-domain.rst @@ -43,7 +43,7 @@ irq_domain=E7=9A=84=E7=94=A8=E6=B3=95 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 =E4=B8=AD=E6=96=AD=E6=8E=A7=E5=88=B6=E5=99=A8=E9=A9=B1=E5=8A=A8=E7=A8=8B= =E5=BA=8F=E9=80=9A=E8=BF=87=E4=BB=A5=E4=B8=8B=E6=96=B9=E5=BC=8F=E5=88=9B=E5= =BB=BA=E5=B9=B6=E6=B3=A8=E5=86=8C=E4=B8=80=E4=B8=AAirq_domain=E3=80=82=E8= =B0=83=E7=94=A8 -irq_domain_add_*() =E6=88=96 irq_domain_create_*()=E5=87=BD=E6=95=B0=E4=B9= =8B=E4=B8=80=EF=BC=88=E6=AF=8F=E4=B8=AA=E6=98=A0=E5=B0=84=E6=96=B9=E6=B3=95= =E9=83=BD=E6=9C=89=E4=B8=8D +irq_domain_add_*_of_node() =E6=88=96 irq_domain_create_*()=E5=87=BD=E6=95= =B0=E4=B9=8B=E4=B8=80=EF=BC=88=E6=AF=8F=E4=B8=AA=E6=98=A0=E5=B0=84=E6=96=B9= =E6=B3=95=E9=83=BD=E6=9C=89=E4=B8=8D =E5=90=8C=E7=9A=84=E5=88=86=E9=85=8D=E5=99=A8=E5=87=BD=E6=95=B0=EF=BC=8C= =E5=90=8E=E9=9D=A2=E4=BC=9A=E8=AF=A6=E7=BB=86=E4=BB=8B=E7=BB=8D=EF=BC=89=E3= =80=82 =E5=87=BD=E6=95=B0=E6=88=90=E5=8A=9F=E5=90=8E=E4=BC=9A=E8=BF=94=E5= =9B=9E=E4=B8=80=E4=B8=AA=E6=8C=87=E5=90=91irq_domain=E7=9A=84=E6=8C=87=E9= =92=88=E3=80=82 =E8=B0=83=E7=94=A8=E8=80=85=E5=BF=85=E9=A1=BB=E5=90=91=E5=88=86=E9=85=8D= =E5=99=A8=E5=87=BD=E6=95=B0=E6=8F=90=E4=BE=9B=E4=B8=80=E4=B8=AAirq_domain_o= ps=E7=BB=93=E6=9E=84=E4=BD=93=E3=80=82 =20 @@ -83,7 +83,7 @@ irq_domain=E6=98=A0=E5=B0=84=E7=9A=84=E7=B1=BB=E5=9E=8B =20 :: =20 - irq_domain_add_linear() + irq_domain_add_linear_of_node() irq_domain_create_linear() =20 =E7=BA=BF=E6=80=A7=E5=8F=8D=E5=90=91=E6=98=A0=E5=B0=84=E7=BB=B4=E6=8A=A4= =E4=BA=86=E4=B8=80=E4=B8=AA=E5=9B=BA=E5=AE=9A=E5=A4=A7=E5=B0=8F=E7=9A=84=E8= =A1=A8=EF=BC=8C=E8=AF=A5=E8=A1=A8=E4=BB=A5hwirq=E5=8F=B7=E4=B8=BA=E7=B4=A2= =E5=BC=95=E3=80=82 =E5=BD=93=E4=B8=80=E4=B8=AAhwirq=E8=A2=AB=E6=98=A0=E5=B0= =84 @@ -93,7 +93,7 @@ irq_domain=E6=98=A0=E5=B0=84=E7=9A=84=E7=B1=BB=E5=9E=8B =E6=98=A0=E5=B0=84=E7=9A=84=E4=BC=98=E7=82=B9=E6=98=AF=E5=9B=BA=E5=AE=9A= =E6=97=B6=E9=97=B4=E6=9F=A5=E6=89=BEIRQ=E5=8F=B7=EF=BC=8C=E8=80=8C=E4=B8=94= irq_descs=E5=8F=AA=E5=88=86=E9=85=8D=E7=BB=99=E5=9C=A8=E7=94=A8=E7=9A=84IRQ= =E3=80=82 =E7=BC=BA=E7=82=B9=E6=98=AF=E8=AF=A5=E8=A1=A8 =E5=BF=85=E9=A1=BB=E5=B0=BD=E5=8F=AF=E8=83=BD=E5=A4=A7=E7=9A=84hwirq=E5=8F= =B7=E3=80=82 =20 -irq_domain_add_linear()=E5=92=8Cirq_domain_create_linear()=E5=9C=A8=E5=8A= =9F=E8=83=BD=E4=B8=8A=E6=98=AF=E7=AD=89=E4=BB=B7=E7=9A=84=EF=BC=8C +irq_domain_add_linear_of_node()=E5=92=8Cirq_domain_create_linear()=E5=9C= =A8=E5=8A=9F=E8=83=BD=E4=B8=8A=E6=98=AF=E7=AD=89=E4=BB=B7=E7=9A=84=EF=BC=8C =E9=99=A4=E4=BA=86=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=8F=82=E6=95=B0=E4=B8=8D= =E5=90=8C--=E5=89=8D=E8=80=85=E6=8E=A5=E5=8F=97=E4=B8=80=E4=B8=AAOpen Firmw= are=E7=89=B9=E5=AE=9A=E7=9A=84 'struct device_node' =E8=80=8C =E5=90=8E=E8=80=85=E6=8E=A5=E5=8F=97=E4=B8=80=E4=B8=AA=E6=9B=B4=E9=80=9A= =E7=94=A8=E7=9A=84=E6=8A=BD=E8=B1=A1 'struct fwnode_handle' =E3=80=82 =20 @@ -104,7 +104,7 @@ irq_domain_add_linear()=E5=92=8Cirq_domain_create_linea= r()=E5=9C=A8=E5=8A=9F=E8=83=BD=E4=B8=8A=E6=98=AF=E7=AD=89=E4=BB=B7=E7=9A=84= =EF=BC=8C =20 :: =20 - irq_domain_add_tree() + irq_domain_add_tree_of_node() irq_domain_create_tree() =20 irq_domain=E7=BB=B4=E6=8A=A4=E7=9D=80=E4=BB=8Ehwirq=E5=8F=B7=E5=88=B0Linux= IRQ=E7=9A=84radix=E7=9A=84=E6=A0=91=E7=8A=B6=E6=98=A0=E5=B0=84=E3=80=82 = =E5=BD=93=E4=B8=80=E4=B8=AAhwirq=E8=A2=AB=E6=98=A0=E5=B0=84=E6=97=B6=EF=BC= =8C @@ -113,7 +113,7 @@ irq_domain=E7=BB=B4=E6=8A=A4=E7=9D=80=E4=BB=8Ehwirq=E5= =8F=B7=E5=88=B0Linux IRQ=E7=9A=84radix=E7=9A=84=E6=A0=91=E7=8A=B6=E6=98=A0= =E5=B0=84=E3=80=82 =E5=BD=93=E4=B8=80=E4=B8=AAhw =E5=A6=82=E6=9E=9Chwirq=E5=8F=B7=E5=8F=AF=E4=BB=A5=E9=9D=9E=E5=B8=B8=E5=A4= =A7=EF=BC=8C=E6=A0=91=E7=8A=B6=E6=98=A0=E5=B0=84=E6=98=AF=E4=B8=80=E4=B8=AA= =E5=BE=88=E5=A5=BD=E7=9A=84=E9=80=89=E6=8B=A9=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5= =AE=83=E4=B8=8D=E9=9C=80=E8=A6=81=E5=88=86=E9=85=8D=E4=B8=80=E4=B8=AA=E5=92= =8C=E6=9C=80=E5=A4=A7hwirq =E5=8F=B7=E4=B8=80=E6=A0=B7=E5=A4=A7=E7=9A=84=E8=A1=A8=E3=80=82 =E7=BC=BA= =E7=82=B9=E6=98=AF=EF=BC=8Chwirq=E5=88=B0IRQ=E5=8F=B7=E7=9A=84=E6=9F=A5=E6= =89=BE=E5=8F=96=E5=86=B3=E4=BA=8E=E8=A1=A8=E4=B8=AD=E6=9C=89=E5=A4=9A=E5=B0= =91=E6=9D=A1=E7=9B=AE=E3=80=82 =20 -irq_domain_add_tree()=E5=92=8Cirq_domain_create_tree()=E5=9C=A8=E5=8A=9F= =E8=83=BD=E4=B8=8A=E6=98=AF=E7=AD=89=E4=BB=B7=E7=9A=84=EF=BC=8C=E9=99=A4=E4= =BA=86=E7=AC=AC=E4=B8=80 +irq_domain_add_tree_of_node()=E5=92=8Cirq_domain_create_tree()=E5=9C=A8=E5= =8A=9F=E8=83=BD=E4=B8=8A=E6=98=AF=E7=AD=89=E4=BB=B7=E7=9A=84=EF=BC=8C=E9=99= =A4=E4=BA=86=E7=AC=AC=E4=B8=80 =E4=B8=AA=E5=8F=82=E6=95=B0=E4=B8=8D=E5=90=8C=E2=80=94=E2=80=94=E5=89=8D= =E8=80=85=E6=8E=A5=E5=8F=97=E4=B8=80=E4=B8=AAOpen Firmware=E7=89=B9=E5=AE= =9A=E7=9A=84 'struct device_node' =EF=BC=8C=E8=80=8C=E5=90=8E=E8=80=85=E6= =8E=A5=E5=8F=97 =E4=B8=80=E4=B8=AA=E6=9B=B4=E9=80=9A=E7=94=A8=E7=9A=84=E6=8A=BD=E8=B1=A1 '= struct fwnode_handle' =E3=80=82 =20 @@ -124,7 +124,7 @@ irq_domain_add_tree()=E5=92=8Cirq_domain_create_tree()= =E5=9C=A8=E5=8A=9F=E8=83=BD=E4=B8=8A=E6=98=AF=E7=AD=89=E4=BB=B7=E7=9A=84=EF= =BC=8C=E9=99=A4 =20 :: =20 - irq_domain_add_nomap() + irq_domain_add_nomap_of_node() =20 =E5=BD=93=E7=A1=AC=E4=BB=B6=E4=B8=AD=E7=9A=84hwirq=E5=8F=B7=E6=98=AF=E5=8F= =AF=E7=BC=96=E7=A8=8B=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=B0=B1=E5=8F=AF= =E4=BB=A5=E9=87=87=E7=94=A8=E6=97=A0=E6=98=A0=E5=B0=84=E7=B1=BB=E5=9E=8B=E3= =80=82 =E5=9C=A8=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E6= =9C=80=E5=A5=BD=E5=B0=86 Linux IRQ=E5=8F=B7=E7=BC=96=E5=85=A5=E7=A1=AC=E4=BB=B6=E6=9C=AC=E8=BA=AB= =EF=BC=8C=E8=BF=99=E6=A0=B7=E5=B0=B1=E4=B8=8D=E9=9C=80=E8=A6=81=E6=98=A0=E5= =B0=84=E4=BA=86=E3=80=82 =E8=B0=83=E7=94=A8irq_create_direct_mapping() @@ -138,8 +138,8 @@ Linux IRQ=E5=8F=B7=E7=BC=96=E5=85=A5=E7=A1=AC=E4=BB=B6= =E6=9C=AC=E8=BA=AB=EF=BC=8C=E8=BF=99=E6=A0=B7=E5=B0=B1=E4=B8=8D=E9=9C=80=E8= =A6=81=E6=98=A0=E5=B0=84=E4=BA=86=E3=80=82 =E8=B0=83=E7=94=A8irq_create =20 :: =20 - irq_domain_add_simple() - irq_domain_add_legacy() + irq_domain_add_simple_of_node() + irq_domain_add_legacy_of_node() irq_domain_create_simple() irq_domain_create_legacy() =20 @@ -158,10 +158,10 @@ Linux IRQ=E5=8F=B7=E7=BC=96=E5=85=A5=E7=A1=AC=E4=BB= =B6=E6=9C=AC=E8=BA=AB=EF=BC=8C=E8=BF=99=E6=A0=B7=E5=B0=B1=E4=B8=8D=E9=9C=80= =E8=A6=81=E6=98=A0=E5=B0=84=E4=BA=86=E3=80=82 =E8=B0=83=E7=94=A8irq_create =E5=8F=AA=E6=9C=89=E5=9C=A8=E5=BF=85=E9=A1=BB=E6=94=AF=E6=8C=81=E5=9B=BA= =E5=AE=9A=E7=9A=84IRQ=E6=98=A0=E5=B0=84=E6=97=B6=EF=BC=8C=E6=89=8D=E5=BA=94= =E4=BD=BF=E7=94=A8=E4=BC=A0=E7=BB=9F=E6=98=A0=E5=B0=84=E3=80=82 =E4=BE=8B= =E5=A6=82=EF=BC=8CISA=E6=8E=A7=E5=88=B6=E5=99=A8=E5=B0=86=E4=BD=BF=E7=94=A8= =E4=BC=A0=E7=BB=9F=E6=98=A0=E5=B0=84=E6=9D=A5 =E6=98=A0=E5=B0=84Linux IRQ 0-15=EF=BC=8C=E8=BF=99=E6=A0=B7=E7=8E=B0=E6=9C= =89=E7=9A=84ISA=E9=A9=B1=E5=8A=A8=E7=A8=8B=E5=BA=8F=E5=B0=B1=E8=83=BD=E5=BE= =97=E5=88=B0=E6=AD=A3=E7=A1=AE=E7=9A=84IRQ=E5=8F=B7=E3=80=82 =20 -=E5=A4=A7=E5=A4=9A=E6=95=B0=E4=BD=BF=E7=94=A8=E4=BC=A0=E7=BB=9F=E6=98=A0= =E5=B0=84=E7=9A=84=E7=94=A8=E6=88=B7=E5=BA=94=E8=AF=A5=E4=BD=BF=E7=94=A8irq= _domain_add_simple()=E6=88=96 +=E5=A4=A7=E5=A4=9A=E6=95=B0=E4=BD=BF=E7=94=A8=E4=BC=A0=E7=BB=9F=E6=98=A0= =E5=B0=84=E7=9A=84=E7=94=A8=E6=88=B7=E5=BA=94=E8=AF=A5=E4=BD=BF=E7=94=A8irq= _domain_add_simple_of_node()=E6=88=96 irq_domain_create_simple()=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=9C=A8=E7=B3=BB=E7= =BB=9F=E6=8F=90=E4=BE=9BIRQ=E8=8C=83=E5=9B=B4=E6=97=B6=E6=89=8D=E4=BC=9A=E4= =BD=BF=E7=94=A8=E4=BC=A0=E7=BB=9F=E5=9F=9F=EF=BC=8C=E5=90=A6=E5=88=99=E5=B0= =86=E4=BD=BF=E7=94=A8 =E7=BA=BF=E6=80=A7=E5=9F=9F=E6=98=A0=E5=B0=84=E3=80=82=E8=BF=99=E4=B8=AA= =E8=B0=83=E7=94=A8=E7=9A=84=E8=AF=AD=E4=B9=89=E6=98=AF=E8=BF=99=E6=A0=B7=E7= =9A=84=EF=BC=9A=E5=A6=82=E6=9E=9C=E6=8C=87=E5=AE=9A=E4=BA=86=E4=B8=80=E4=B8= =AAIRQ=E8=8C=83=E5=9B=B4=EF=BC=8C=E9=82=A3=E4=B9=88 =E6=8F=8F=E8=BF=B0=E7= =AC=A6=E5=B0=86=E8=A2=AB=E5=8D=B3=E6=97=B6=E5=88=86=E9=85=8D -=E7=BB=99=E5=AE=83=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E8=8C=83= =E5=9B=B4=E8=A2=AB=E5=88=86=E9=85=8D=EF=BC=8C=E5=AE=83=E5=B0=86=E4=B8=8D=E4= =BC=9A=E6=89=A7=E8=A1=8C irq_domain_add_linear() =E6=88=96 +=E7=BB=99=E5=AE=83=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E8=8C=83= =E5=9B=B4=E8=A2=AB=E5=88=86=E9=85=8D=EF=BC=8C=E5=AE=83=E5=B0=86=E4=B8=8D=E4= =BC=9A=E6=89=A7=E8=A1=8C irq_domain_add_linear_of_node() =E6=88=96 irq_domain_create_linear()=EF=BC=8C=E8=BF=99=E6=84=8F=E5=91=B3=E7=9D=80 *n= o* irq =E6=8F=8F=E8=BF=B0=E7=AC=A6=E5=B0=86=E8=A2=AB=E5=88=86=E9=85=8D=E3= =80=82 =20 =E4=B8=80=E4=B8=AA=E7=AE=80=E5=8D=95=E5=9F=9F=E7=9A=84=E5=85=B8=E5=9E=8B= =E7=94=A8=E4=BE=8B=E6=98=AF=EF=BC=8Cirqchip=E4=BE=9B=E5=BA=94=E5=95=86=E5= =90=8C=E6=97=B6=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E5=92=8C=E9=9D=99=E6=80= =81IRQ=E5=88=86=E9=85=8D=E3=80=82 @@ -170,8 +170,8 @@ irq_domain_create_linear()=EF=BC=8C=E8=BF=99=E6=84=8F= =E5=91=B3=E7=9D=80 *no* irq =E6=8F=8F=E8=BF=B0=E7=AC=A6=E5=B0=86=E8=A2=AB= =E5=88=86=E9=85=8D=E3=80=82 irq_find_mapping()=E4=B9=8B=E5=89=8D=E8=B0=83=E7=94=A8irq_create_mapping()= =E6=98=AF=E9=9D=9E=E5=B8=B8=E9=87=8D=E8=A6=81=E7=9A=84=EF=BC=8C=E5=9B=A0=E4= =B8=BA=E5=90=8E=E8=80=85=E5=AE=9E=E9=99=85=E4=B8=8A =E5=B0=86=E7=94=A8=E4=BA=8E=E9=9D=99=E6=80=81IRQ=E5=88=86=E9=85=8D=E6=83= =85=E5=86=B5=E3=80=82 =20 -irq_domain_add_simple()=E5=92=8Cirq_domain_create_simple()=E4=BB=A5=E5=8F= =8A -irq_domain_add_legacy()=E5=92=8Cirq_domain_create_legacy()=E5=9C=A8=E5=8A= =9F=E8=83=BD=E4=B8=8A=E6=98=AF=E7=AD=89=E4=BB=B7=E7=9A=84=EF=BC=8C=E5=8F=AA +irq_domain_add_simple_of_node()=E5=92=8Cirq_domain_create_simple()=E4=BB= =A5=E5=8F=8A +irq_domain_add_legacy_of_node()=E5=92=8Cirq_domain_create_legacy()=E5=9C= =A8=E5=8A=9F=E8=83=BD=E4=B8=8A=E6=98=AF=E7=AD=89=E4=BB=B7=E7=9A=84=EF=BC=8C= =E5=8F=AA =E6=98=AF=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=8F=82=E6=95=B0=E4=B8=8D=E5=90=8C--= =E5=89=8D=E8=80=85=E6=8E=A5=E5=8F=97Open Firmware=E7=89=B9=E5=AE=9A=E7=9A= =84 'struct device_node' =EF=BC=8C=E8=80=8C=E5=90=8E=E8=80=85 =E6=8E=A5=E5=8F=97=E4=B8=80=E4=B8=AA=E6=9B=B4=E9=80=9A=E7=94=A8=E7=9A=84= =E6=8A=BD=E8=B1=A1 'struct fwnode_handle' =E3=80=82 =20 diff --git a/arch/arc/kernel/intc-arcv2.c b/arch/arc/kernel/intc-arcv2.c index fea29d9d18d6..65320bd17ab9 100644 --- a/arch/arc/kernel/intc-arcv2.c +++ b/arch/arc/kernel/intc-arcv2.c @@ -170,7 +170,7 @@ init_onchip_IRQ(struct device_node *intc, struct device= _node *parent) if (parent) panic("DeviceTree incore intc not a root irq controller\n"); =20 - root_domain =3D irq_domain_add_linear(intc, nr_cpu_irqs, &arcv2_irq_ops, = NULL); + root_domain =3D irq_domain_add_linear_of_node(intc, nr_cpu_irqs, &arcv2_i= rq_ops, NULL); if (!root_domain) panic("root irq domain not avail\n"); =20 diff --git a/arch/arc/kernel/intc-compact.c b/arch/arc/kernel/intc-compact.c index 1d2ff1c6a61b..16f4d4fc5e58 100644 --- a/arch/arc/kernel/intc-compact.c +++ b/arch/arc/kernel/intc-compact.c @@ -112,7 +112,7 @@ init_onchip_IRQ(struct device_node *intc, struct device= _node *parent) if (parent) panic("DeviceTree incore intc not a root irq controller\n"); =20 - root_domain =3D irq_domain_add_linear(intc, NR_CPU_IRQS, + root_domain =3D irq_domain_add_linear_of_node(intc, NR_CPU_IRQS, &arc_intc_domain_ops, NULL); if (!root_domain) panic("root irq domain not avail\n"); diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c index 55373ca0d28b..868646f57bd7 100644 --- a/arch/arc/kernel/mcip.c +++ b/arch/arc/kernel/mcip.c @@ -393,7 +393,7 @@ idu_of_init(struct device_node *intc, struct device_nod= e *parent) =20 pr_info("MCIP: IDU supports %u common irqs\n", nr_irqs); =20 - domain =3D irq_domain_add_linear(intc, nr_irqs, &idu_irq_ops, NULL); + domain =3D irq_domain_add_linear_of_node(intc, nr_irqs, &idu_irq_ops, NUL= L); =20 /* Parent interrupts (core-intc) are already mapped */ =20 diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 9846f30990f7..d9cb30417d29 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -416,7 +416,7 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsi= gned irq_base) writel_relaxed(~0, irqbase + SA1111_INTSTATCLR0); writel_relaxed(~0, irqbase + SA1111_INTSTATCLR1); =20 - sachip->irqdomain =3D irq_domain_add_linear(NULL, SA1111_IRQ_NR, + sachip->irqdomain =3D irq_domain_add_linear_of_node(NULL, SA1111_IRQ_NR, &sa1111_irqdomain_ops, sachip); if (!sachip->irqdomain) { diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index cac4e82f6c82..d28562c1735f 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -209,7 +209,7 @@ static int __init exynos_pmu_irq_init(struct device_nod= e *node, return -ENOMEM; } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, 0, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, 0, node, &exynos_pmu_domain_ops, NULL); if (!domain) { diff --git a/arch/arm/mach-imx/avic.c b/arch/arm/mach-imx/avic.c index cf6546ddc7a3..426f494e638d 100644 --- a/arch/arm/mach-imx/avic.c +++ b/arch/arm/mach-imx/avic.c @@ -201,7 +201,7 @@ static void __init mxc_init_irq(void __iomem *irqbase) WARN_ON(irq_base < 0); =20 np =3D of_find_compatible_node(NULL, NULL, "fsl,avic"); - domain =3D irq_domain_add_legacy(np, AVIC_NUM_IRQS, irq_base, 0, + domain =3D irq_domain_add_legacy_of_node(np, AVIC_NUM_IRQS, irq_base, 0, &irq_domain_simple_ops, NULL); WARN_ON(!domain); =20 diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 5909088d5482..76a8605aa6f5 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -245,7 +245,7 @@ static int __init imx_gpc_init(struct device_node *node, if (WARN_ON(!gpc_base)) return -ENOMEM; =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, GPC_MAX_IRQ= S, node, &imx_gpc_domain_ops, NULL); if (!domain) { diff --git a/arch/arm/mach-imx/tzic.c b/arch/arm/mach-imx/tzic.c index 8b3d98d288d9..3e501d6e1d65 100644 --- a/arch/arm/mach-imx/tzic.c +++ b/arch/arm/mach-imx/tzic.c @@ -175,7 +175,7 @@ static int __init tzic_init_dt(struct device_node *np, = struct device_node *p) irq_base =3D irq_alloc_descs(-1, 0, TZIC_NUM_IRQS, numa_node_id()); WARN_ON(irq_base < 0); =20 - domain =3D irq_domain_add_legacy(np, TZIC_NUM_IRQS, irq_base, 0, + domain =3D irq_domain_add_legacy_of_node(np, TZIC_NUM_IRQS, irq_base, 0, &irq_domain_simple_ops, NULL); WARN_ON(!domain); =20 diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index 9b587ecebb1c..9dd8b66fdc7a 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c @@ -220,7 +220,7 @@ void __init omap1_init_irq(void) omap_l2_irq =3D irq_base; omap_l2_irq -=3D NR_IRQS_LEGACY; =20 - domain =3D irq_domain_add_legacy(NULL, nr_irqs, irq_base, 0, + domain =3D irq_domain_add_legacy_of_node(NULL, nr_irqs, irq_base, 0, &irq_domain_simple_ops, NULL); =20 pr_info("Total of %lu interrupts in %i interrupt banks\n", diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/oma= p-wakeupgen.c index 6f0d6120c174..e97cbada330c 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -585,7 +585,7 @@ static int __init wakeupgen_init(struct device_node *no= de, wakeupgen_ops =3D &am43xx_wakeupgen_ops; } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, max_irqs, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, max_irqs, node, &wakeupgen_domain_ops, NULL); if (!domain) { diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index d9cadd97748a..049b06b4adfa 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c @@ -147,7 +147,7 @@ pxa_init_irq_common(struct device_node *node, int irq_n= r, int n; =20 pxa_internal_irq_nr =3D irq_nr; - pxa_irq_domain =3D irq_domain_add_legacy(node, irq_nr, + pxa_irq_domain =3D irq_domain_add_legacy_of_node(node, irq_nr, PXA_IRQ(0), 0, &pxa_irq_ops, NULL); if (!pxa_irq_domain) diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c index 595e9cb33c1d..4be49518f82f 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/plat-orion/gpio.c @@ -602,7 +602,7 @@ void __init orion_gpio_init(int gpio_base, int ngpio, IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE); =20 /* Setup irq domain on top of the generic chip. */ - ochip->domain =3D irq_domain_add_legacy(NULL, + ochip->domain =3D irq_domain_add_legacy_of_node(NULL, ochip->chip.ngpio, ochip->secondary_irq_base, ochip->secondary_irq_base, diff --git a/arch/mips/ath25/ar2315.c b/arch/mips/ath25/ar2315.c index 8ccf167c167e..ff00eebeac99 100644 --- a/arch/mips/ath25/ar2315.c +++ b/arch/mips/ath25/ar2315.c @@ -149,7 +149,7 @@ void __init ar2315_arch_init_irq(void) =20 ath25_irq_dispatch =3D ar2315_irq_dispatch; =20 - domain =3D irq_domain_add_linear(NULL, AR2315_MISC_IRQ_COUNT, + domain =3D irq_domain_add_linear_of_node(NULL, AR2315_MISC_IRQ_COUNT, &ar2315_misc_irq_domain_ops, NULL); if (!domain) panic("Failed to add IRQ domain"); diff --git a/arch/mips/ath25/ar5312.c b/arch/mips/ath25/ar5312.c index cfa103518113..bca985273138 100644 --- a/arch/mips/ath25/ar5312.c +++ b/arch/mips/ath25/ar5312.c @@ -143,7 +143,7 @@ void __init ar5312_arch_init_irq(void) =20 ath25_irq_dispatch =3D ar5312_irq_dispatch; =20 - domain =3D irq_domain_add_linear(NULL, AR5312_MISC_IRQ_COUNT, + domain =3D irq_domain_add_linear_of_node(NULL, AR5312_MISC_IRQ_COUNT, &ar5312_misc_irq_domain_ops, NULL); if (!domain) panic("Failed to add IRQ domain"); diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon= /octeon-irq.c index e6b4d9c0c169..6dc2f2817157 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -1503,7 +1503,7 @@ static int __init octeon_irq_init_ciu( /* Mips internal */ octeon_irq_init_core(); =20 - ciu_domain =3D irq_domain_add_tree( + ciu_domain =3D irq_domain_add_tree_of_node( ciu_node, &octeon_irq_domain_ciu_ops, dd); irq_set_default_domain(ciu_domain); =20 @@ -1637,7 +1637,7 @@ static int __init octeon_irq_init_gpio( if (gpiod) { /* gpio domain host_data is the base hwirq number. */ gpiod->base_hwirq =3D base_hwirq; - irq_domain_add_linear( + irq_domain_add_linear_of_node( gpio_node, 16, &octeon_irq_domain_gpio_ops, gpiod); } else { pr_warn("Cannot allocate memory for GPIO irq_domain.\n"); @@ -2074,7 +2074,7 @@ static int __init octeon_irq_init_ciu2( /* Mips internal */ octeon_irq_init_core(); =20 - ciu_domain =3D irq_domain_add_tree( + ciu_domain =3D irq_domain_add_tree_of_node( ciu_node, &octeon_irq_domain_ciu2_ops, NULL); irq_set_default_domain(ciu_domain); =20 @@ -2331,11 +2331,11 @@ static int __init octeon_irq_init_cib(struct device= _node *ciu_node, } host_data->max_bits =3D val; =20 - cib_domain =3D irq_domain_add_linear(ciu_node, host_data->max_bits, + cib_domain =3D irq_domain_add_linear_of_node(ciu_node, host_data->max_bit= s, &octeon_irq_domain_cib_ops, host_data); if (!cib_domain) { - pr_err("ERROR: Couldn't irq_domain_add_linear()\n"); + pr_err("ERROR: Couldn't irq_domain_add_linear_of_node()\n"); return -ENOMEM; } =20 @@ -2918,7 +2918,7 @@ static int __init octeon_irq_init_ciu3(struct device_= node *ciu_node, * Initialize all domains to use the default domain. Specific major * blocks will overwrite the default domain as needed. */ - domain =3D irq_domain_add_tree(ciu_node, &octeon_dflt_domain_ciu3_ops, + domain =3D irq_domain_add_tree_of_node(ciu_node, &octeon_dflt_domain_ciu3= _ops, ciu3_info); for (i =3D 0; i < MAX_CIU3_DOMAINS; i++) ciu3_info->domain[i] =3D domain; diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c index 8f208007b8e8..3004f3d4c676 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c @@ -377,7 +377,7 @@ int __init icu_of_init(struct device_node *node, struct= device_node *parent) for (i =3D 0; i < MAX_IM; i++) irq_set_chained_handler(i + 2, ltq_hw_irq_handler); =20 - ltq_domain =3D irq_domain_add_linear(node, + ltq_domain =3D irq_domain_add_linear_of_node(node, (MAX_IM * INT_NUM_IM_OFFSET) + MIPS_CPU_IRQ_CASCADE, &irq_domain_ops, 0); =20 diff --git a/arch/mips/pci/pci-ar2315.c b/arch/mips/pci/pci-ar2315.c index a925842ee125..9479d00d4d96 100644 --- a/arch/mips/pci/pci-ar2315.c +++ b/arch/mips/pci/pci-ar2315.c @@ -469,7 +469,7 @@ static int ar2315_pci_probe(struct platform_device *pde= v) if (err) return err; =20 - apc->domain =3D irq_domain_add_linear(NULL, AR2315_PCI_IRQ_COUNT, + apc->domain =3D irq_domain_add_linear_of_node(NULL, AR2315_PCI_IRQ_COUNT, &ar2315_pci_irq_domain_ops, apc); if (!apc->domain) { dev_err(dev, "failed to add IRQ domain\n"); diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c index 4ac68a534e4f..d56cf8053e32 100644 --- a/arch/mips/pci/pci-rt3883.c +++ b/arch/mips/pci/pci-rt3883.c @@ -208,7 +208,7 @@ static int rt3883_pci_irq_init(struct device *dev, rt3883_pci_w32(rpc, 0, RT3883_PCI_REG_PCIENA); =20 rpc->irq_domain =3D - irq_domain_add_linear(rpc->intc_of_node, RT3883_PCI_IRQ_COUNT, + irq_domain_add_linear_of_node(rpc->intc_of_node, RT3883_PCI_IRQ_COUNT, &rt3883_pci_irq_domain_ops, rpc); if (!rpc->irq_domain) { diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c index 46aef0a1b22a..dd06100d6125 100644 --- a/arch/mips/ralink/irq.c +++ b/arch/mips/ralink/irq.c @@ -176,7 +176,7 @@ static int __init intc_of_init(struct device_node *node, /* route all INTC interrupts to MIPS HW0 interrupt */ rt_intc_w32(0, INTC_REG_TYPE); =20 - domain =3D irq_domain_add_legacy(node, RALINK_INTC_IRQ_COUNT, + domain =3D irq_domain_add_legacy_of_node(node, RALINK_INTC_IRQ_COUNT, RALINK_INTC_IRQ_BASE, 0, &irq_domain_ops, NULL); if (!domain) panic("Failed to add irqdomain"); diff --git a/arch/nios2/kernel/irq.c b/arch/nios2/kernel/irq.c index 8fa280660051..dd6d2c6948df 100644 --- a/arch/nios2/kernel/irq.c +++ b/arch/nios2/kernel/irq.c @@ -69,7 +69,7 @@ void __init init_IRQ(void) =20 BUG_ON(!node); =20 - domain =3D irq_domain_add_linear(node, NIOS2_CPU_NR_IRQS, &irq_ops, NULL); + domain =3D irq_domain_add_linear_of_node(node, NIOS2_CPU_NR_IRQS, &irq_op= s, NULL); BUG_ON(!domain); =20 irq_set_default_domain(domain); diff --git a/arch/powerpc/platforms/44x/uic.c b/arch/powerpc/platforms/44x/= uic.c index f49214f4f4a9..5a8e9e81d9c8 100644 --- a/arch/powerpc/platforms/44x/uic.c +++ b/arch/powerpc/platforms/44x/uic.c @@ -254,7 +254,7 @@ static struct uic * __init uic_init_one(struct device_n= ode *node) } uic->dcrbase =3D *dcrreg; =20 - uic->irqhost =3D irq_domain_add_linear(node, NR_UIC_INTS, &uic_host_ops, + uic->irqhost =3D irq_domain_add_linear_of_node(node, NR_UIC_INTS, &uic_ho= st_ops, uic); if (! uic->irqhost) return NULL; /* FIXME: panic? */ diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/= platforms/512x/mpc5121_ads_cpld.c index e995eb30bf09..3bad6fd6d453 100644 --- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c @@ -188,7 +188,7 @@ mpc5121_ads_cpld_pic_init(void) =20 cpld_pic_node =3D of_node_get(np); =20 - cpld_pic_host =3D irq_domain_add_linear(np, 16, &cpld_pic_host_ops, NULL); + cpld_pic_host =3D irq_domain_add_linear_of_node(np, 16, &cpld_pic_host_op= s, NULL); if (!cpld_pic_host) { printk(KERN_ERR "CPLD PIC: failed to allocate irq host!\n"); goto end; diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platfor= ms/52xx/media5200.c index 19626cd42406..b5e31ede1b23 100644 --- a/arch/powerpc/platforms/52xx/media5200.c +++ b/arch/powerpc/platforms/52xx/media5200.c @@ -168,7 +168,7 @@ static void __init media5200_init_irq(void) =20 spin_lock_init(&media5200_irq.lock); =20 - media5200_irq.irqhost =3D irq_domain_add_linear(fpga_np, + media5200_irq.irqhost =3D irq_domain_add_linear_of_node(fpga_np, MEDIA5200_NUM_IRQS, &media5200_irq_ops, &media5200_irq); if (!media5200_irq.irqhost) goto out; diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platf= orms/52xx/mpc52xx_gpt.c index 1ea591ec6083..2c1caa1c77f7 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c @@ -247,9 +247,9 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, str= uct device_node *node) if (!cascade_virq) return; =20 - gpt->irqhost =3D irq_domain_add_linear(node, 1, &mpc52xx_gpt_irq_ops, gpt= ); + gpt->irqhost =3D irq_domain_add_linear_of_node(node, 1, &mpc52xx_gpt_irq_= ops, gpt); if (!gpt->irqhost) { - dev_err(gpt->dev, "irq_domain_add_linear() failed\n"); + dev_err(gpt->dev, "irq_domain_add_linear_of_node() failed\n"); return; } =20 diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platf= orms/52xx/mpc52xx_pic.c index 43c881d31ca6..16ca49a2fe62 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c @@ -446,7 +446,7 @@ void __init mpc52xx_init_irq(void) * As last step, add an irq host to translate the real * hw irq information provided by the ofw to linux virq */ - mpc52xx_irqhost =3D irq_domain_add_linear(picnode, + mpc52xx_irqhost =3D irq_domain_add_linear_of_node(picnode, MPC52xx_IRQ_HIGHTESTHWIRQ, &mpc52xx_irqhost_ops, NULL); =20 diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc= /platforms/85xx/socrates_fpga_pic.c index 60e0b8947ce6..56dab9e37e4f 100644 --- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c +++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c @@ -278,7 +278,7 @@ void __init socrates_fpga_pic_init(struct device_node *= pic) int i; =20 /* Setup an irq_domain structure */ - socrates_fpga_pic_irq_host =3D irq_domain_add_linear(pic, + socrates_fpga_pic_irq_host =3D irq_domain_add_linear_of_node(pic, SOCRATES_FPGA_NUM_IRQS, &socrates_fpga_pic_host_ops, NULL); if (socrates_fpga_pic_irq_host =3D=3D NULL) { pr_err("FPGA PIC: Unable to allocate host\n"); diff --git a/arch/powerpc/platforms/8xx/cpm1-ic.c b/arch/powerpc/platforms/= 8xx/cpm1-ic.c index a18fc7c99f83..72c1a5b22263 100644 --- a/arch/powerpc/platforms/8xx/cpm1-ic.c +++ b/arch/powerpc/platforms/8xx/cpm1-ic.c @@ -110,7 +110,7 @@ static int cpm_pic_probe(struct platform_device *pdev) =20 out_be32(&data->reg->cpic_cimr, 0); =20 - data->host =3D irq_domain_add_linear(dev->of_node, 64, &cpm_pic_host_ops,= data); + data->host =3D irq_domain_add_linear_of_node(dev->of_node, 64, &cpm_pic_h= ost_ops, data); if (!data->host) return -ENODEV; =20 diff --git a/arch/powerpc/platforms/8xx/pic.c b/arch/powerpc/platforms/8xx/= pic.c index ea6b0e523c60..3d2065f5235c 100644 --- a/arch/powerpc/platforms/8xx/pic.c +++ b/arch/powerpc/platforms/8xx/pic.c @@ -146,7 +146,7 @@ void __init mpc8xx_pic_init(void) if (!siu_reg) goto out; =20 - mpc8xx_pic_host =3D irq_domain_add_linear(np, 64, &mpc8xx_pic_host_ops, N= ULL); + mpc8xx_pic_host =3D irq_domain_add_linear_of_node(np, 64, &mpc8xx_pic_hos= t_ops, NULL); if (!mpc8xx_pic_host) printk(KERN_ERR "MPC8xx PIC: failed to allocate irq host!\n"); =20 diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platform= s/cell/axon_msi.c index d243f7fd8982..4d203b71b38d 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c @@ -376,7 +376,7 @@ static int axon_msi_probe(struct platform_device *devic= e) memset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES); =20 /* We rely on being able to stash a virq in a u16, so limit irqs to < 655= 36 */ - msic->irq_domain =3D irq_domain_add_nomap(dn, 65536, &msic_host_ops, msic= ); + msic->irq_domain =3D irq_domain_add_nomap_of_node(dn, 65536, &msic_host_o= ps, msic); if (!msic->irq_domain) { printk(KERN_ERR "axon_msi: couldn't allocate irq_domain for %pOF\n", dn); diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platfor= ms/cell/interrupt.c index 887f3eef3e07..70de2942699a 100644 --- a/arch/powerpc/platforms/cell/interrupt.c +++ b/arch/powerpc/platforms/cell/interrupt.c @@ -357,7 +357,7 @@ static int __init setup_iic(void) void __init iic_init_IRQ(void) { /* Setup an irq host data structure */ - iic_host =3D irq_domain_add_linear(NULL, IIC_SOURCE_COUNT, &iic_host_ops, + iic_host =3D irq_domain_add_linear_of_node(NULL, IIC_SOURCE_COUNT, &iic_h= ost_ops, NULL); BUG_ON(iic_host =3D=3D NULL); irq_set_default_domain(iic_host); diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platfo= rms/cell/spider-pic.c index 11df737c8c6a..917cd0e896ba 100644 --- a/arch/powerpc/platforms/cell/spider-pic.c +++ b/arch/powerpc/platforms/cell/spider-pic.c @@ -282,7 +282,7 @@ static void __init spider_init_one(struct device_node *= of_node, int chip, panic("spider_pic: can't map registers !"); =20 /* Allocate a host */ - pic->host =3D irq_domain_add_linear(of_node, SPIDER_SRC_COUNT, + pic->host =3D irq_domain_add_linear_of_node(of_node, SPIDER_SRC_COUNT, &spider_host_ops, pic); if (pic->host =3D=3D NULL) panic("spider_pic: can't allocate irq host !"); diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerp= c/platforms/embedded6xx/flipper-pic.c index 013d66304c31..312a9d40a2a2 100644 --- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c +++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c @@ -149,7 +149,7 @@ static struct irq_domain * __init flipper_pic_init(stru= ct device_node *np) =20 __flipper_quiesce(io_base); =20 - irq_domain =3D irq_domain_add_linear(np, FLIPPER_NR_IRQS, + irq_domain =3D irq_domain_add_linear_of_node(np, FLIPPER_NR_IRQS, &flipper_irq_domain_ops, io_base); if (!irq_domain) { pr_err("failed to allocate irq_domain\n"); diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/p= latforms/embedded6xx/hlwd-pic.c index 4d2d92de30af..e27f26a84f7d 100644 --- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c +++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c @@ -175,7 +175,7 @@ static struct irq_domain *__init hlwd_pic_init(struct d= evice_node *np) =20 __hlwd_quiesce(io_base); =20 - irq_domain =3D irq_domain_add_linear(np, HLWD_NR_IRQS, + irq_domain =3D irq_domain_add_linear_of_node(np, HLWD_NR_IRQS, &hlwd_irq_domain_ops, io_base); if (!irq_domain) { pr_err("failed to allocate irq_domain\n"); diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms= /powermac/pic.c index 03a7c51f2645..2a5810944d32 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c @@ -327,7 +327,7 @@ static void __init pmac_pic_probe_oldstyle(void) /* * Allocate an irq host */ - pmac_pic_host =3D irq_domain_add_linear(master, max_irqs, + pmac_pic_host =3D irq_domain_add_linear_of_node(master, max_irqs, &pmac_pic_host_ops, NULL); BUG_ON(pmac_pic_host =3D=3D NULL); irq_set_default_domain(pmac_pic_host); diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms= /powermac/smp.c index 09e7fe24fac1..9f7935f822b6 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c @@ -190,7 +190,7 @@ static int __init psurge_secondary_ipi_init(void) { int rc =3D -ENOMEM; =20 - psurge_host =3D irq_domain_add_nomap(NULL, ~0, &psurge_host_ops, NULL); + psurge_host =3D irq_domain_add_nomap_of_node(NULL, ~0, &psurge_host_ops, = NULL); =20 if (psurge_host) psurge_secondary_virq =3D irq_create_direct_mapping(psurge_host); diff --git a/arch/powerpc/platforms/powernv/opal-irqchip.c b/arch/powerpc/p= latforms/powernv/opal-irqchip.c index d92759c21fae..2e6539fdc121 100644 --- a/arch/powerpc/platforms/powernv/opal-irqchip.c +++ b/arch/powerpc/platforms/powernv/opal-irqchip.c @@ -191,7 +191,7 @@ int __init opal_event_init(void) * fall back to the legacy method (opal_event_request(...)) * anyway. */ dn =3D of_find_compatible_node(NULL, NULL, "ibm,opal-event"); - opal_event_irqchip.domain =3D irq_domain_add_linear(dn, MAX_NUM_EVENTS, + opal_event_irqchip.domain =3D irq_domain_add_linear_of_node(dn, MAX_NUM_E= VENTS, &opal_event_domain_ops, &opal_event_irqchip); of_node_put(dn); if (!opal_event_irqchip.domain) { diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platform= s/ps3/interrupt.c index 95e96bd61a20..d63aa752839c 100644 --- a/arch/powerpc/platforms/ps3/interrupt.c +++ b/arch/powerpc/platforms/ps3/interrupt.c @@ -743,7 +743,7 @@ void __init ps3_init_IRQ(void) unsigned cpu; struct irq_domain *host; =20 - host =3D irq_domain_add_nomap(NULL, PS3_PLUG_MAX + 1, &ps3_host_ops, NULL= ); + host =3D irq_domain_add_nomap_of_node(NULL, PS3_PLUG_MAX + 1, &ps3_host_o= ps, NULL); irq_set_default_domain(host); =20 for_each_possible_cpu(cpu) { diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c index e14493685fe8..66b716e9e335 100644 --- a/arch/powerpc/sysdev/cpm2_pic.c +++ b/arch/powerpc/sysdev/cpm2_pic.c @@ -259,7 +259,7 @@ void cpm2_pic_init(struct device_node *node) out_be32(&cpm2_intctl->ic_scprrl, 0x05309770); =20 /* create a legacy host */ - cpm2_pic_host =3D irq_domain_add_linear(node, 64, &cpm2_pic_host_ops, NUL= L); + cpm2_pic_host =3D irq_domain_add_linear_of_node(node, 64, &cpm2_pic_host_= ops, NULL); if (cpm2_pic_host =3D=3D NULL) { printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n"); return; diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c index fb502b72fca1..0af7a114b5ca 100644 --- a/arch/powerpc/sysdev/ehv_pic.c +++ b/arch/powerpc/sysdev/ehv_pic.c @@ -269,7 +269,7 @@ void __init ehv_pic_init(void) return; } =20 - ehv_pic->irqhost =3D irq_domain_add_linear(np, NR_EHV_PIC_INTS, + ehv_pic->irqhost =3D irq_domain_add_linear_of_node(np, NR_EHV_PIC_INTS, &ehv_pic_host_ops, ehv_pic); if (!ehv_pic->irqhost) { of_node_put(np); diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index 1aa0cb097c9c..57785f68ce42 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c @@ -412,7 +412,7 @@ static int fsl_of_msi_probe(struct platform_device *dev) } platform_set_drvdata(dev, msi); =20 - msi->irqhost =3D irq_domain_add_linear(dev->dev.of_node, + msi->irqhost =3D irq_domain_add_linear_of_node(dev->dev.of_node, NR_MSI_IRQS_MAX, &fsl_msi_host_ops, msi); =20 if (msi->irqhost =3D=3D NULL) { diff --git a/arch/powerpc/sysdev/ge/ge_pic.c b/arch/powerpc/sysdev/ge/ge_pi= c.c index a6c424680c37..5a695b4ff310 100644 --- a/arch/powerpc/sysdev/ge/ge_pic.c +++ b/arch/powerpc/sysdev/ge/ge_pic.c @@ -214,7 +214,7 @@ void __init gef_pic_init(struct device_node *np) } =20 /* Setup an irq_domain structure */ - gef_pic_irq_host =3D irq_domain_add_linear(np, GEF_PIC_NUM_IRQS, + gef_pic_irq_host =3D irq_domain_add_linear_of_node(np, GEF_PIC_NUM_IRQS, &gef_pic_host_ops, NULL); if (gef_pic_irq_host =3D=3D NULL) return; diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c index 06e391485da7..1df64377dc18 100644 --- a/arch/powerpc/sysdev/i8259.c +++ b/arch/powerpc/sysdev/i8259.c @@ -260,7 +260,7 @@ void i8259_init(struct device_node *node, unsigned long= intack_addr) raw_spin_unlock_irqrestore(&i8259_lock, flags); =20 /* create a legacy host */ - i8259_host =3D irq_domain_add_legacy(node, NR_IRQS_LEGACY, 0, 0, + i8259_host =3D irq_domain_add_legacy_of_node(node, NR_IRQS_LEGACY, 0, 0, &i8259_host_ops, NULL); if (i8259_host =3D=3D NULL) { printk(KERN_ERR "i8259: failed to allocate irq host !\n"); diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index 075297e91e0b..b5a46dfd8f73 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c @@ -711,7 +711,7 @@ struct ipic * __init ipic_init(struct device_node *node= , unsigned int flags) if (ipic =3D=3D NULL) return NULL; =20 - ipic->irqhost =3D irq_domain_add_linear(node, NR_IPIC_INTS, + ipic->irqhost =3D irq_domain_add_linear_of_node(node, NR_IPIC_INTS, &ipic_host_ops, ipic); if (ipic->irqhost =3D=3D NULL) { kfree(ipic); diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 4afbab83a2e2..d203823e8471 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -1483,7 +1483,7 @@ struct mpic * __init mpic_alloc(struct device_node *n= ode, mpic->isu_shift =3D 1 + __ilog2(mpic->isu_size - 1); mpic->isu_mask =3D (1 << mpic->isu_shift) - 1; =20 - mpic->irqhost =3D irq_domain_add_linear(mpic->node, + mpic->irqhost =3D irq_domain_add_linear_of_node(mpic->node, intvec_top, &mpic_host_ops, mpic); =20 diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_= pci.c index 0e42f7bad7db..451eeae4d12d 100644 --- a/arch/powerpc/sysdev/tsi108_pci.c +++ b/arch/powerpc/sysdev/tsi108_pci.c @@ -404,7 +404,7 @@ void __init tsi108_pci_int_init(struct device_node *nod= e) { DBG("Tsi108_pci_int_init: initializing PCI interrupts\n"); =20 - pci_irq_host =3D irq_domain_add_legacy(node, NR_IRQS_LEGACY, 0, 0, + pci_irq_host =3D irq_domain_add_legacy_of_node(node, NR_IRQS_LEGACY, 0, 0, &pci_irq_domain_ops, NULL); if (pci_irq_host =3D=3D NULL) { printk(KERN_ERR "pci_irq_host: failed to allocate irq domain!\n"); diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/c= ommon.c index dc2e61837396..d4e28b581b4a 100644 --- a/arch/powerpc/sysdev/xive/common.c +++ b/arch/powerpc/sysdev/xive/common.c @@ -1464,7 +1464,7 @@ static const struct irq_domain_ops xive_irq_domain_op= s =3D { =20 static void __init xive_init_host(struct device_node *np) { - xive_irq_domain =3D irq_domain_add_tree(np, &xive_irq_domain_ops, NULL); + xive_irq_domain =3D irq_domain_add_tree_of_node(np, &xive_irq_domain_ops,= NULL); if (WARN_ON(xive_irq_domain =3D=3D NULL)) return; irq_set_default_domain(xive_irq_domain); diff --git a/arch/sh/boards/mach-se/7343/irq.c b/arch/sh/boards/mach-se/734= 3/irq.c index f9f3b14f70d5..ac9db1f7aae1 100644 --- a/arch/sh/boards/mach-se/7343/irq.c +++ b/arch/sh/boards/mach-se/7343/irq.c @@ -47,7 +47,7 @@ static void __init se7343_domain_init(void) { int i; =20 - se7343_irq_domain =3D irq_domain_add_linear(NULL, SE7343_FPGA_IRQ_NR, + se7343_irq_domain =3D irq_domain_add_linear_of_node(NULL, SE7343_FPGA_IRQ= _NR, &irq_domain_simple_ops, NULL); if (unlikely(!se7343_irq_domain)) { printk("Failed to get IRQ domain\n"); diff --git a/arch/sh/boards/mach-se/7722/irq.c b/arch/sh/boards/mach-se/772= 2/irq.c index efa96edd47dc..3902e13fa87b 100644 --- a/arch/sh/boards/mach-se/7722/irq.c +++ b/arch/sh/boards/mach-se/7722/irq.c @@ -46,7 +46,7 @@ static void __init se7722_domain_init(void) { int i; =20 - se7722_irq_domain =3D irq_domain_add_linear(NULL, SE7722_FPGA_IRQ_NR, + se7722_irq_domain =3D irq_domain_add_linear_of_node(NULL, SE7722_FPGA_IRQ= _NR, &irq_domain_simple_ops, NULL); if (unlikely(!se7722_irq_domain)) { printk("Failed to get IRQ domain\n"); diff --git a/arch/sh/boards/mach-x3proto/gpio.c b/arch/sh/boards/mach-x3pro= to/gpio.c index f82d3a6a844a..9c96ce4e9b10 100644 --- a/arch/sh/boards/mach-x3proto/gpio.c +++ b/arch/sh/boards/mach-x3proto/gpio.c @@ -108,7 +108,7 @@ int __init x3proto_gpio_setup(void) if (unlikely(ret)) goto err_gpio; =20 - x3proto_irq_domain =3D irq_domain_add_linear(NULL, NR_BASEBOARD_GPIOS, + x3proto_irq_domain =3D irq_domain_add_linear_of_node(NULL, NR_BASEBOARD_G= PIOS, &x3proto_gpio_irq_ops, NULL); if (unlikely(!x3proto_irq_domain)) goto err_irq; diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c index 6276551d7968..f4d42c48c8df 100644 --- a/drivers/bus/moxtet.c +++ b/drivers/bus/moxtet.c @@ -737,7 +737,7 @@ static int moxtet_irq_setup(struct moxtet *moxtet) { int i, ret; =20 - moxtet->irq.domain =3D irq_domain_add_simple(moxtet->dev->of_node, + moxtet->irq.domain =3D irq_domain_add_simple_of_node(moxtet->dev->of_node, MOXTET_NIRQS, 0, &moxtet_irq_domain, moxtet); if (moxtet->irq.domain =3D=3D NULL) { diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 3e971f902363..4cc1738b966f 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -2130,7 +2130,7 @@ static int altr_edac_a10_probe(struct platform_device= *pdev) edac->irq_chip.name =3D pdev->dev.of_node->name; edac->irq_chip.irq_mask =3D a10_eccmgr_irq_mask; edac->irq_chip.irq_unmask =3D a10_eccmgr_irq_unmask; - edac->domain =3D irq_domain_add_linear(pdev->dev.of_node, 64, + edac->domain =3D irq_domain_add_linear_of_node(pdev->dev.of_node, 64, &a10_eccmgr_ic_ops, edac); if (!edac->domain) { dev_err(&pdev->dev, "Error adding IRQ domain\n"); diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 491b529d25f8..82c802df981b 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -436,7 +436,7 @@ static int brcmstb_gpio_irq_setup(struct platform_devic= e *pdev, int err; =20 priv->irq_domain =3D - irq_domain_add_linear(np, priv->num_gpios, + irq_domain_add_linear_of_node(np, priv->num_gpios, &brcmstb_gpio_irq_domain_ops, priv); if (!priv->irq_domain) { diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 8c033e8cf3c9..a749e36fdfea 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c @@ -477,7 +477,7 @@ static int davinci_gpio_irq_setup(struct platform_devic= e *pdev) return irq; } =20 - irq_domain =3D irq_domain_add_legacy(dev->of_node, ngpio, irq, 0, + irq_domain =3D irq_domain_add_legacy_of_node(dev->of_node, ngpio, irq, 0, &davinci_gpio_irq_ops, chips); if (!irq_domain) { diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index 6c862c572322..fcd888d28c85 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c @@ -323,7 +323,7 @@ static int em_gio_probe(struct platform_device *pdev) irq_chip->irq_release_resources =3D em_gio_irq_relres; irq_chip->flags =3D IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND; =20 - p->irq_domain =3D irq_domain_add_simple(dev->of_node, ngpios, 0, + p->irq_domain =3D irq_domain_add_simple_of_node(dev->of_node, ngpios, 0, &em_gio_irq_domain_ops, p); if (!p->irq_domain) { dev_err(dev, "cannot initialize irq domain\n"); diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index 169f33c41c59..53db28fcc1a1 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -396,7 +396,7 @@ static int grgpio_probe(struct platform_device *ofdev) return -EINVAL; } =20 - priv->domain =3D irq_domain_add_linear(np, gc->ngpio, + priv->domain =3D irq_domain_add_linear_of_node(np, gc->ngpio, &grgpio_irq_domain_ops, priv); if (!priv->domain) { diff --git a/drivers/gpio/gpio-lpc18xx.c b/drivers/gpio/gpio-lpc18xx.c index 2cf9fb4637a2..c4e8006b33e8 100644 --- a/drivers/gpio/gpio-lpc18xx.c +++ b/drivers/gpio/gpio-lpc18xx.c @@ -240,7 +240,7 @@ static int lpc18xx_gpio_pin_ic_probe(struct lpc18xx_gpi= o_chip *gc) =20 raw_spin_lock_init(&ic->lock); =20 - ic->domain =3D irq_domain_add_hierarchy(parent_domain, 0, + ic->domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, NR_LPC18XX_GPIO_PIN_IC_IRQS, dev->of_node, &lpc18xx_gpio_pin_ic_domain_ops, diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 5ffb332e9849..cc9f860c5cbb 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -1241,7 +1241,7 @@ static int mvebu_gpio_probe(struct platform_device *p= dev) return 0; =20 mvchip->domain =3D - irq_domain_add_linear(np, ngpios, &irq_generic_chip_ops, NULL); + irq_domain_add_linear_of_node(np, ngpios, &irq_generic_chip_ops, NULL= ); if (!mvchip->domain) { dev_err(&pdev->dev, "couldn't allocate irq domain %s (DT).\n", mvchip->chip.label); diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 4cb455b2bdee..6d24e89b767c 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c @@ -503,7 +503,7 @@ static int mxc_gpio_probe(struct platform_device *pdev) goto out_bgio; } =20 - port->domain =3D irq_domain_add_legacy(np, 32, irq_base, 0, + port->domain =3D irq_domain_add_legacy_of_node(np, 32, irq_base, 0, &irq_domain_simple_ops, NULL); if (!port->domain) { err =3D -ENODEV; diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c index 024ad077e98d..7a09837d7562 100644 --- a/drivers/gpio/gpio-mxs.c +++ b/drivers/gpio/gpio-mxs.c @@ -303,7 +303,7 @@ static int mxs_gpio_probe(struct platform_device *pdev) goto out_iounmap; } =20 - port->domain =3D irq_domain_add_legacy(np, 32, irq_base, 0, + port->domain =3D irq_domain_add_legacy_of_node(np, 32, irq_base, 0, &irq_domain_simple_ops, NULL); if (!port->domain) { err =3D -ENODEV; diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 91cea97255fa..7a85f30763a8 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -636,7 +636,7 @@ static int pxa_gpio_probe(struct platform_device *pdev) if (!pxa_last_gpio) return -EINVAL; =20 - pchip->irqdomain =3D irq_domain_add_legacy(pdev->dev.of_node, + pchip->irqdomain =3D irq_domain_add_legacy_of_node(pdev->dev.of_node, pxa_last_gpio + 1, irq_base, 0, &pxa_irq_domain_ops, pchip); if (!pchip->irqdomain) diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c index 01a3b3dac58b..ad9611bd5874 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -521,7 +521,7 @@ static int rockchip_interrupts_register(struct rockchip= _pin_bank *bank) struct irq_chip_generic *gc; int ret; =20 - bank->domain =3D irq_domain_add_linear(bank->of_node, 32, + bank->domain =3D irq_domain_add_linear_of_node(bank->of_node, 32, &irq_generic_chip_ops, NULL); if (!bank->domain) { dev_warn(bank->dev, "could not init irq domain for bank %s\n", diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c index 242dad763ac4..17758f1b087e 100644 --- a/drivers/gpio/gpio-sa1100.c +++ b/drivers/gpio/gpio-sa1100.c @@ -319,7 +319,7 @@ void __init sa1100_init_gpio(void) =20 gpiochip_add_data(&sa1100_gpio_chip.chip, NULL); =20 - sa1100_gpio_irqdomain =3D irq_domain_add_simple(NULL, + sa1100_gpio_irqdomain =3D irq_domain_add_simple_of_node(NULL, 28, IRQ_GPIO0, &sa1100_gpio_irqdomain_ops, sgc); =20 diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/gpio-sodaville.c index c2a2c76c1652..8cf4cd541f16 100644 --- a/drivers/gpio/gpio-sodaville.c +++ b/drivers/gpio/gpio-sodaville.c @@ -169,7 +169,7 @@ static int sdv_register_irqsupport(struct sdv_gpio_chip= _data *sd, IRQ_GC_INIT_MASK_CACHE, IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE); =20 - sd->id =3D irq_domain_add_legacy(pdev->dev.of_node, SDV_NUM_PUB_GPIOS, + sd->id =3D irq_domain_add_legacy_of_node(pdev->dev.of_node, SDV_NUM_PUB_G= PIOS, sd->irq_base, 0, &irq_domain_sdv_ops, sd); if (!sd->id) return -ENODEV; diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c index b6335cde455f..7b1d610c6160 100644 --- a/drivers/gpio/gpio-tb10x.c +++ b/drivers/gpio/gpio-tb10x.c @@ -183,7 +183,7 @@ static int tb10x_gpio_probe(struct platform_device *pde= v) if (ret !=3D 0) return ret; =20 - tb10x_gpio->domain =3D irq_domain_add_linear(np, + tb10x_gpio->domain =3D irq_domain_add_linear_of_node(np, tb10x_gpio->gc.ngpio, &irq_generic_chip_ops, NULL); if (!tb10x_gpio->domain) { diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c index bcd692229c7c..9b51328780ce 100644 --- a/drivers/gpio/gpio-twl4030.c +++ b/drivers/gpio/gpio-twl4030.c @@ -524,7 +524,7 @@ static int gpio_twl4030_probe(struct platform_device *p= dev) return irq_base; } =20 - irq_domain_add_legacy(node, TWL4030_GPIO_MAX, irq_base, 0, + irq_domain_add_legacy_of_node(node, TWL4030_GPIO_MAX, irq_base, 0, &irq_domain_simple_ops, NULL); =20 ret =3D twl4030_sih_setup(&pdev->dev, TWL4030_MODULE_GPIO, irq_base); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_irq.c index 19ce4da285e8..0a68529cc0de 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -725,7 +725,7 @@ static const struct irq_domain_ops amdgpu_hw_irqdomain_= ops =3D { */ int amdgpu_irq_add_domain(struct amdgpu_device *adev) { - adev->irq.domain =3D irq_domain_add_linear(NULL, AMDGPU_MAX_IRQ_SRC_ID, + adev->irq.domain =3D irq_domain_add_linear_of_node(NULL, AMDGPU_MAX_IRQ_S= RC_ID, &amdgpu_hw_irqdomain_ops, adev); if (!adev->irq.domain) { DRM_ERROR("GPU irq add domain failed\n"); diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index dcb49fd30402..ab0fe2125544 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -150,7 +150,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *ms= m_mdss) =20 dev =3D msm_mdss->dev; =20 - domain =3D irq_domain_add_linear(dev->of_node, 32, + domain =3D irq_domain_add_linear_of_node(dev->of_node, 32, &msm_mdss_irqdomain_ops, msm_mdss); if (!domain) { dev_err(dev, "failed to add irq_domain\n"); diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-commo= n.c index 947323f4a234..6d5f8d0bb6eb 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c @@ -1207,7 +1207,7 @@ static int ipu_irq_init(struct ipu_soc *ipu) }; int ret, i; =20 - ipu->domain =3D irq_domain_add_linear(ipu->dev->of_node, IPU_NUM_IRQS, + ipu->domain =3D irq_domain_add_linear_of_node(ipu->dev->of_node, IPU_NUM_= IRQS, &irq_generic_chip_ops, ipu); if (!ipu->domain) { dev_err(ipu->dev, "failed to add irq domain\n"); diff --git a/drivers/i2c/busses/i2c-cht-wc.c b/drivers/i2c/busses/i2c-cht-w= c.c index 26a36a65521e..6b46a3f14037 100644 --- a/drivers/i2c/busses/i2c-cht-wc.c +++ b/drivers/i2c/busses/i2c-cht-wc.c @@ -467,7 +467,7 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_de= vice *pdev) return ret; =20 /* Alloc and register client IRQ */ - adap->irq_domain =3D irq_domain_add_linear(NULL, 1, &irq_domain_simple_op= s, NULL); + adap->irq_domain =3D irq_domain_add_linear_of_node(NULL, 1, &irq_domain_s= imple_ops, NULL); if (!adap->irq_domain) return -ENOMEM; =20 diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mu= x-pca954x.c index 6f84018258c4..289d4812aaa3 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -442,7 +442,7 @@ static int pca954x_irq_setup(struct i2c_mux_core *muxc) =20 raw_spin_lock_init(&data->lock); =20 - data->irq =3D irq_domain_add_linear(client->dev.of_node, + data->irq =3D irq_domain_add_linear_of_node(client->dev.of_node, data->chip->nchans, &irq_domain_simple_ops, data); if (!data->irq) diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-c= ore.c index 2201ee9987ae..85aa09f54f40 100644 --- a/drivers/iio/adc/stm32-adc-core.c +++ b/drivers/iio/adc/stm32-adc-core.c @@ -421,7 +421,7 @@ static int stm32_adc_irq_probe(struct platform_device *= pdev, return priv->irq[i]; } =20 - priv->domain =3D irq_domain_add_simple(np, STM32_ADC_MAX_ADCS, 0, + priv->domain =3D irq_domain_add_simple_of_node(np, STM32_ADC_MAX_ADCS, 0, &stm32_adc_domain_ops, priv); if (!priv->domain) { diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-com= biner.c index 552aa04ff063..147dc3e11dd0 100644 --- a/drivers/irqchip/exynos-combiner.c +++ b/drivers/irqchip/exynos-combiner.c @@ -180,7 +180,7 @@ static void __init combiner_init(void __iomem *combiner= _base, if (!combiner_data) return; =20 - combiner_irq_domain =3D irq_domain_add_linear(np, nr_irq, + combiner_irq_domain =3D irq_domain_add_linear_of_node(np, nr_irq, &combiner_irq_domain_ops, combiner_data); if (WARN_ON(!combiner_irq_domain)) { pr_warn("%s: irq domain init failed\n", __func__); diff --git a/drivers/irqchip/irq-al-fic.c b/drivers/irqchip/irq-al-fic.c index dfb761e86c9c..2ecc7259f376 100644 --- a/drivers/irqchip/irq-al-fic.c +++ b/drivers/irqchip/irq-al-fic.c @@ -139,7 +139,7 @@ static int al_fic_register(struct device_node *node, struct irq_chip_generic *gc; int ret; =20 - fic->domain =3D irq_domain_add_linear(node, + fic->domain =3D irq_domain_add_linear_of_node(node, NR_FIC_IRQS, &irq_generic_chip_ops, fic); diff --git a/drivers/irqchip/irq-alpine-msi.c b/drivers/irqchip/irq-alpine-= msi.c index 0207d35135da..2d31a296916a 100644 --- a/drivers/irqchip/irq-alpine-msi.c +++ b/drivers/irqchip/irq-alpine-msi.c @@ -205,7 +205,7 @@ static int alpine_msix_init_domains(struct alpine_msix_= data *priv, return -ENXIO; } =20 - middle_domain =3D irq_domain_add_hierarchy(gic_domain, 0, 0, NULL, + middle_domain =3D irq_domain_add_hierarchy_of_node(gic_domain, 0, 0, NULL, &alpine_msix_middle_domain_ops, priv); if (!middle_domain) { diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-arma= da-370-xp.c index de98d16c1718..89c2abd2342d 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -348,7 +348,7 @@ static int __init mpic_msi_init(struct mpic *mpic, stru= ct device_node *node, mpic->msi_doorbell_mask =3D PCI_MSI_FULL_DOORBELL_MASK; } =20 - mpic->msi_inner_domain =3D irq_domain_add_linear(NULL, mpic->msi_doorbell= _size, + mpic->msi_inner_domain =3D irq_domain_add_linear_of_node(NULL, mpic->msi_= doorbell_size, &mpic_msi_domain_ops, mpic); if (!mpic->msi_inner_domain) return -ENOMEM; @@ -861,7 +861,7 @@ static int __init mpic_of_init(struct device_node *node= , struct device_node *par if (!mpic_is_ipi_available(mpic)) nr_irqs =3D MPIC_PER_CPU_IRQS_NR; =20 - mpic->domain =3D irq_domain_add_linear(node, nr_irqs, &mpic_irq_ops, mpic= ); + mpic->domain =3D irq_domain_add_linear_of_node(node, nr_irqs, &mpic_irq_o= ps, mpic); if (!mpic->domain) { pr_err("%pOF: Unable to add IRQ domain\n", node); return -ENOMEM; diff --git a/drivers/irqchip/irq-aspeed-i2c-ic.c b/drivers/irqchip/irq-aspe= ed-i2c-ic.c index 9c9fc3e2967e..fbdbc985c727 100644 --- a/drivers/irqchip/irq-aspeed-i2c-ic.c +++ b/drivers/irqchip/irq-aspeed-i2c-ic.c @@ -82,7 +82,7 @@ static int __init aspeed_i2c_ic_of_init(struct device_nod= e *node, goto err_iounmap; } =20 - i2c_ic->irq_domain =3D irq_domain_add_linear(node, ASPEED_I2C_IC_NUM_BUS, + i2c_ic->irq_domain =3D irq_domain_add_linear_of_node(node, ASPEED_I2C_IC_= NUM_BUS, &aspeed_i2c_ic_irq_domain_ops, NULL); if (!i2c_ic->irq_domain) { diff --git a/drivers/irqchip/irq-aspeed-intc.c b/drivers/irqchip/irq-aspeed= -intc.c index bd3b759b4b2c..a5716d36d124 100644 --- a/drivers/irqchip/irq-aspeed-intc.c +++ b/drivers/irqchip/irq-aspeed-intc.c @@ -102,7 +102,7 @@ static int __init aspeed_intc_ic_of_init(struct device_= node *node, writel(0xffffffff, intc_ic->base + INTC_INT_STATUS_REG); writel(0x0, intc_ic->base + INTC_INT_ENABLE_REG); =20 - intc_ic->irq_domain =3D irq_domain_add_linear(node, INTC_IRQS_PER_WORD, + intc_ic->irq_domain =3D irq_domain_add_linear_of_node(node, INTC_IRQS_PER= _WORD, &aspeed_intc_ic_irq_domain_ops, intc_ic); if (!intc_ic->irq_domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-aspeed-scu-ic.c b/drivers/irqchip/irq-aspe= ed-scu-ic.c index 94a7223e95df..0e9ac3c9fe4b 100644 --- a/drivers/irqchip/irq-aspeed-scu-ic.c +++ b/drivers/irqchip/irq-aspeed-scu-ic.c @@ -165,7 +165,7 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_s= cu_ic *scu_ic, goto err; } =20 - scu_ic->irq_domain =3D irq_domain_add_linear(node, scu_ic->num_irqs, + scu_ic->irq_domain =3D irq_domain_add_linear_of_node(node, scu_ic->num_ir= qs, &aspeed_scu_ic_domain_ops, scu_ic); if (!scu_ic->irq_domain) { diff --git a/drivers/irqchip/irq-aspeed-vic.c b/drivers/irqchip/irq-aspeed-= vic.c index 62ccf2c0c414..b3ed3b0b34eb 100644 --- a/drivers/irqchip/irq-aspeed-vic.c +++ b/drivers/irqchip/irq-aspeed-vic.c @@ -211,7 +211,7 @@ static int __init avic_of_init(struct device_node *node, set_handle_irq(avic_handle_irq); =20 /* Register our domain */ - vic->dom =3D irq_domain_add_simple(node, NUM_IRQS, 0, + vic->dom =3D irq_domain_add_simple_of_node(node, NUM_IRQS, 0, &avic_dom_ops, vic); =20 return 0; diff --git a/drivers/irqchip/irq-ath79-misc.c b/drivers/irqchip/irq-ath79-m= isc.c index 92f001a5ff8d..0d37437c0092 100644 --- a/drivers/irqchip/irq-ath79-misc.c +++ b/drivers/irqchip/irq-ath79-misc.c @@ -147,7 +147,7 @@ static int __init ath79_misc_intc_of_init( return -ENOMEM; } =20 - domain =3D irq_domain_add_linear(node, ATH79_MISC_IRQ_COUNT, + domain =3D irq_domain_add_linear_of_node(node, ATH79_MISC_IRQ_COUNT, &misc_irq_domain_ops, base); if (!domain) { pr_err("Failed to add MISC irqdomain\n"); @@ -188,7 +188,7 @@ void __init ath79_misc_irq_init(void __iomem *regs, int= irq, else ath79_misc_irq_chip.irq_ack =3D ar724x_misc_irq_ack; =20 - domain =3D irq_domain_add_legacy(NULL, ATH79_MISC_IRQ_COUNT, + domain =3D irq_domain_add_legacy_of_node(NULL, ATH79_MISC_IRQ_COUNT, irq_base, 0, &misc_irq_domain_ops, regs); if (!domain) panic("Failed to create MISC irqdomain"); diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-a= tmel-aic-common.c index 4525366d16d6..4361ceb629a6 100644 --- a/drivers/irqchip/irq-atmel-aic-common.c +++ b/drivers/irqchip/irq-atmel-aic-common.c @@ -228,7 +228,7 @@ struct irq_domain *__init aic_common_of_init(struct dev= ice_node *node, goto err_iounmap; } =20 - domain =3D irq_domain_add_linear(node, nchips * 32, ops, aic); + domain =3D irq_domain_add_linear_of_node(node, nchips * 32, ops, aic); if (!domain) { ret =3D -ENOMEM; goto err_free_aic; diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c index 6c20604c2242..44c5953f29b0 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -144,7 +144,7 @@ static int __init armctrl_of_init(struct device_node *n= ode, if (!base) panic("%pOF: unable to map IC registers\n", node); =20 - intc.domain =3D irq_domain_add_linear(node, MAKE_HWIRQ(NR_BANKS, 0), + intc.domain =3D irq_domain_add_linear_of_node(node, MAKE_HWIRQ(NR_BANKS, = 0), &armctrl_ops, NULL); if (!intc.domain) panic("%pOF: unable to create IRQ domain\n", node); diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c index e366257684b5..aedd69494b9f 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -325,7 +325,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(s= truct device_node *node, =20 bcm2835_init_local_timer_frequency(); =20 - intc.domain =3D irq_domain_add_linear(node, LAST_IRQ + 1, + intc.domain =3D irq_domain_add_linear_of_node(node, LAST_IRQ + 1, &bcm2836_arm_irqchip_intc_ops, NULL); if (!intc.domain) diff --git a/drivers/irqchip/irq-bcm6345-l1.c b/drivers/irqchip/irq-bcm6345= -l1.c index 90daa274ef23..8e93da0965d6 100644 --- a/drivers/irqchip/irq-bcm6345-l1.c +++ b/drivers/irqchip/irq-bcm6345-l1.c @@ -316,7 +316,7 @@ static int __init bcm6345_l1_of_init(struct device_node= *dn, =20 raw_spin_lock_init(&intc->lock); =20 - intc->domain =3D irq_domain_add_linear(dn, IRQS_PER_WORD * intc->n_words, + intc->domain =3D irq_domain_add_linear_of_node(dn, IRQS_PER_WORD * intc->= n_words, &bcm6345_l1_domain_ops, intc); if (!intc->domain) { diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038= -l1.c index 36e71af054e9..c307b4aa7c02 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c @@ -416,7 +416,7 @@ static int __init bcm7038_l1_of_init(struct device_node= *dn, } } =20 - intc->domain =3D irq_domain_add_linear(dn, IRQS_PER_WORD * intc->n_words, + intc->domain =3D irq_domain_add_linear_of_node(dn, IRQS_PER_WORD * intc->= n_words, &bcm7038_l1_domain_ops, intc); if (!intc->domain) { diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120= -l2.c index 1e9dab6e0d86..824ebe8d0b6d 100644 --- a/drivers/irqchip/irq-bcm7120-l2.c +++ b/drivers/irqchip/irq-bcm7120-l2.c @@ -264,7 +264,7 @@ static int __init bcm7120_l2_intc_probe(struct device_n= ode *dn, goto out_free_l1_data; } =20 - data->domain =3D irq_domain_add_linear(dn, IRQS_PER_WORD * data->n_words, + data->domain =3D irq_domain_add_linear_of_node(dn, IRQS_PER_WORD * data->= n_words, &irq_generic_chip_ops, NULL); if (!data->domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb= -l2.c index c988886917f7..70968dae2b68 100644 --- a/drivers/irqchip/irq-brcmstb-l2.c +++ b/drivers/irqchip/irq-brcmstb-l2.c @@ -208,7 +208,7 @@ static int __init brcmstb_l2_intc_of_init(struct device= _node *np, goto out_unmap; } =20 - data->domain =3D irq_domain_add_linear(np, 32, + data->domain =3D irq_domain_add_linear_of_node(np, 32, &irq_generic_chip_ops, NULL); if (!data->domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-clps711x.c b/drivers/irqchip/irq-clps711x.c index 48c73c948ddf..33b4ac96e956 100644 --- a/drivers/irqchip/irq-clps711x.c +++ b/drivers/irqchip/irq-clps711x.c @@ -184,7 +184,7 @@ static int __init _clps711x_intc_init(struct device_nod= e *np, clps711x_intc->ops.map =3D clps711x_intc_irq_map; clps711x_intc->ops.xlate =3D irq_domain_xlate_onecell; clps711x_intc->domain =3D - irq_domain_add_legacy(np, ARRAY_SIZE(clps711x_irqs), + irq_domain_add_legacy_of_node(np, ARRAY_SIZE(clps711x_irqs), 0, 0, &clps711x_intc->ops, NULL); if (!clps711x_intc->domain) { err =3D -ENOMEM; diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index a05a7501e107..8692e1fb09ff 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c @@ -351,7 +351,7 @@ static int __init irqcrossbar_init(struct device_node *= node, if (err) return err; =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, cb->max_crossbar_sources, node, &crossbar_domain_ops, NULL); diff --git a/drivers/irqchip/irq-csky-apb-intc.c b/drivers/irqchip/irq-csky= -apb-intc.c index 6710691e4c25..c5a3bdd1c8bd 100644 --- a/drivers/irqchip/irq-csky-apb-intc.c +++ b/drivers/irqchip/irq-csky-apb-intc.c @@ -114,7 +114,7 @@ ck_intc_init_comm(struct device_node *node, struct devi= ce_node *parent) return -EINVAL; } =20 - root_domain =3D irq_domain_add_linear(node, nr_irq, + root_domain =3D irq_domain_add_linear_of_node(node, nr_irq, &irq_generic_chip_ops, NULL); if (!root_domain) { pr_err("C-SKY Intc irq_domain_add failed.\n"); diff --git a/drivers/irqchip/irq-csky-mpintc.c b/drivers/irqchip/irq-csky-m= pintc.c index 4aebd67d4f8f..9517a5ce8c88 100644 --- a/drivers/irqchip/irq-csky-mpintc.c +++ b/drivers/irqchip/irq-csky-mpintc.c @@ -255,7 +255,7 @@ csky_mpintc_init(struct device_node *node, struct devic= e_node *parent) writel_relaxed(BIT(0), INTCG_base + INTCG_ICTLR); } =20 - root_domain =3D irq_domain_add_linear(node, nr_irq, &csky_irqdomain_ops, + root_domain =3D irq_domain_add_linear_of_node(node, nr_irq, &csky_irqdoma= in_ops, NULL); if (!root_domain) return -ENXIO; diff --git a/drivers/irqchip/irq-davinci-cp-intc.c b/drivers/irqchip/irq-da= vinci-cp-intc.c index f4f8e9fadbbf..c81b2442d983 100644 --- a/drivers/irqchip/irq-davinci-cp-intc.c +++ b/drivers/irqchip/irq-davinci-cp-intc.c @@ -212,7 +212,7 @@ davinci_cp_intc_do_init(const struct davinci_cp_intc_co= nfig *config, return irq_base; } =20 - davinci_cp_intc_irq_domain =3D irq_domain_add_legacy( + davinci_cp_intc_irq_domain =3D irq_domain_add_legacy_of_node( node, config->num_irqs, irq_base, 0, &davinci_cp_intc_irq_domain_ops, NULL); =20 diff --git a/drivers/irqchip/irq-digicolor.c b/drivers/irqchip/irq-digicolo= r.c index 3b0d78aac13b..dc1ef02ecdfb 100644 --- a/drivers/irqchip/irq-digicolor.c +++ b/drivers/irqchip/irq-digicolor.c @@ -95,7 +95,7 @@ static int __init digicolor_of_init(struct device_node *n= ode, regmap_write(ucregs, UC_IRQ_CONTROL, 1); =20 digicolor_irq_domain =3D - irq_domain_add_linear(node, 64, &irq_generic_chip_ops, NULL); + irq_domain_add_linear_of_node(node, 64, &irq_generic_chip_ops, NULL); if (!digicolor_irq_domain) { pr_err("%pOF: unable to create IRQ domain\n", node); return -ENOMEM; diff --git a/drivers/irqchip/irq-dw-apb-ictl.c b/drivers/irqchip/irq-dw-apb= -ictl.c index d5c1c750c8d2..355a761e5295 100644 --- a/drivers/irqchip/irq-dw-apb-ictl.c +++ b/drivers/irqchip/irq-dw-apb-ictl.c @@ -173,7 +173,7 @@ static int __init dw_apb_ictl_init(struct device_node *= np, else nrirqs =3D fls(readl_relaxed(iobase + APB_INT_ENABLE_L)); =20 - domain =3D irq_domain_add_linear(np, nrirqs, domain_ops, NULL); + domain =3D irq_domain_add_linear_of_node(np, nrirqs, domain_ops, NULL); if (!domain) { pr_err("%pOF: unable to add irq domain\n", np); ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-ftintc010.c b/drivers/irqchip/irq-ftintc01= 0.c index b91c358ea6db..8ee4a3a11c30 100644 --- a/drivers/irqchip/irq-ftintc010.c +++ b/drivers/irqchip/irq-ftintc010.c @@ -180,7 +180,7 @@ static int __init ft010_of_init_irq(struct device_node = *node, writel(0, FT010_IRQ_MASK(f->base)); writel(0, FT010_FIQ_MASK(f->base)); =20 - f->domain =3D irq_domain_add_simple(node, FT010_NUM_IRQS, 0, + f->domain =3D irq_domain_add_simple_of_node(node, FT010_NUM_IRQS, 0, &ft010_irqdomain_ops, f); set_handle_irq(ft010_irqchip_handle_irq); =20 diff --git a/drivers/irqchip/irq-goldfish-pic.c b/drivers/irqchip/irq-goldf= ish-pic.c index 513f6edbbe95..50cc2172254f 100644 --- a/drivers/irqchip/irq-goldfish-pic.c +++ b/drivers/irqchip/irq-goldfish-pic.c @@ -101,7 +101,7 @@ static int __init goldfish_pic_of_init(struct device_no= de *of_node, irq_setup_generic_chip(gc, IRQ_MSK(GFPIC_NR_IRQS), 0, IRQ_NOPROBE | IRQ_LEVEL, 0); =20 - gfpic->irq_domain =3D irq_domain_add_legacy(of_node, GFPIC_NR_IRQS, + gfpic->irq_domain =3D irq_domain_add_legacy_of_node(of_node, GFPIC_NR_IRQ= S, GFPIC_IRQ_BASE, 0, &goldfish_irq_domain_ops, NULL); diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c index 31c3f70a5d5e..00c2fb40cf51 100644 --- a/drivers/irqchip/irq-hip04.c +++ b/drivers/irqchip/irq-hip04.c @@ -386,7 +386,7 @@ hip04_of_init(struct device_node *node, struct device_n= ode *parent) return -EINVAL; } =20 - hip04_data.domain =3D irq_domain_add_legacy(node, nr_irqs, irq_base, + hip04_data.domain =3D irq_domain_add_legacy_of_node(node, nr_irqs, irq_ba= se, 0, &hip04_irq_domain_ops, &hip04_data); diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c index 115bdcffab24..3f0932f0c6f5 100644 --- a/drivers/irqchip/irq-i8259.c +++ b/drivers/irqchip/irq-i8259.c @@ -313,7 +313,7 @@ struct irq_domain * __init __init_i8259_irqs(struct dev= ice_node *node) =20 init_8259A(0); =20 - domain =3D irq_domain_add_legacy(node, 16, I8259A_IRQ_BASE, 0, + domain =3D irq_domain_add_legacy_of_node(node, 16, I8259A_IRQ_BASE, 0, &i8259A_ops, NULL); if (!domain) panic("Failed to add i8259 IRQ domain"); diff --git a/drivers/irqchip/irq-idt3243x.c b/drivers/irqchip/irq-idt3243x.c index 0732a0e9af62..13275a5ab2b1 100644 --- a/drivers/irqchip/irq-idt3243x.c +++ b/drivers/irqchip/irq-idt3243x.c @@ -72,7 +72,7 @@ static int idt_pic_init(struct device_node *of_node, stru= ct device_node *parent) goto out_unmap_irq; } =20 - domain =3D irq_domain_add_linear(of_node, IDT_PIC_NR_IRQS, + domain =3D irq_domain_add_linear_of_node(of_node, IDT_PIC_NR_IRQS, &irq_generic_chip_ops, NULL); if (!domain) { pr_err("Failed to add irqdomain!\n"); diff --git a/drivers/irqchip/irq-imgpdc.c b/drivers/irqchip/irq-imgpdc.c index 85f80bac0961..edd1c03d3956 100644 --- a/drivers/irqchip/irq-imgpdc.c +++ b/drivers/irqchip/irq-imgpdc.c @@ -372,7 +372,7 @@ static int pdc_intc_probe(struct platform_device *pdev) priv->syswake_irq =3D irq; =20 /* Set up an IRQ domain */ - priv->domain =3D irq_domain_add_linear(node, 16, &irq_generic_chip_ops, + priv->domain =3D irq_domain_add_linear_of_node(node, 16, &irq_generic_chi= p_ops, priv); if (unlikely(!priv->domain)) { dev_err(&pdev->dev, "cannot add IRQ domain\n"); diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv= 2.c index 095ae8e3217e..3fc0ba278107 100644 --- a/drivers/irqchip/irq-imx-gpcv2.c +++ b/drivers/irqchip/irq-imx-gpcv2.c @@ -240,7 +240,7 @@ static int __init imx_gpcv2_irqchip_init(struct device_= node *node, return -ENOMEM; } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, GPC_MAX_IRQ= S, node, &gpcv2_irqchip_data_domain_ops, cd); if (!domain) { iounmap(cd->gpc_base); diff --git a/drivers/irqchip/irq-imx-intmux.c b/drivers/irqchip/irq-imx-int= mux.c index 787543d07565..adfc3386ad51 100644 --- a/drivers/irqchip/irq-imx-intmux.c +++ b/drivers/irqchip/irq-imx-intmux.c @@ -254,7 +254,7 @@ static int imx_intmux_probe(struct platform_device *pde= v) goto out; } =20 - domain =3D irq_domain_add_linear(np, 32, &imx_intmux_domain_ops, + domain =3D irq_domain_add_linear_of_node(np, 32, &imx_intmux_domain_ops, &data->irqchip_data[i]); if (!domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-imx-irqsteer.c b/drivers/irqchip/irq-imx-i= rqsteer.c index b0e9788c0045..52fa0a192822 100644 --- a/drivers/irqchip/irq-imx-irqsteer.c +++ b/drivers/irqchip/irq-imx-irqsteer.c @@ -212,7 +212,7 @@ static int imx_irqsteer_probe(struct platform_device *p= dev) /* steer all IRQs into configured channel */ writel_relaxed(BIT(data->channel), data->regs + CHANCTRL); =20 - data->domain =3D irq_domain_add_linear(np, data->reg_num * 32, + data->domain =3D irq_domain_add_linear_of_node(np, data->reg_num * 32, &imx_irqsteer_domain_ops, data); if (!data->domain) { dev_err(&pdev->dev, "failed to create IRQ domain\n"); diff --git a/drivers/irqchip/irq-ingenic-tcu.c b/drivers/irqchip/irq-ingeni= c-tcu.c index 3363f83bd7e9..e1af08dccf4d 100644 --- a/drivers/irqchip/irq-ingenic-tcu.c +++ b/drivers/irqchip/irq-ingenic-tcu.c @@ -114,7 +114,7 @@ static int __init ingenic_tcu_irq_init(struct device_no= de *np, =20 tcu->nb_parent_irqs =3D irqs; =20 - tcu->domain =3D irq_domain_add_linear(np, 32, &irq_generic_chip_ops, + tcu->domain =3D irq_domain_add_linear_of_node(np, 32, &irq_generic_chip_o= ps, NULL); if (!tcu->domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c index cee839ca627e..a1324b688324 100644 --- a/drivers/irqchip/irq-ingenic.c +++ b/drivers/irqchip/irq-ingenic.c @@ -90,7 +90,7 @@ static int __init ingenic_intc_of_init(struct device_node= *node, goto out_unmap_irq; } =20 - domain =3D irq_domain_add_linear(node, num_chips * 32, + domain =3D irq_domain_add_linear_of_node(node, num_chips * 32, &irq_generic_chip_ops, NULL); if (!domain) { err =3D -ENOMEM; diff --git a/drivers/irqchip/irq-jcore-aic.c b/drivers/irqchip/irq-jcore-ai= c.c index b9dcc8e78c75..4ec6c85c523a 100644 --- a/drivers/irqchip/irq-jcore-aic.c +++ b/drivers/irqchip/irq-jcore-aic.c @@ -107,7 +107,7 @@ static int __init aic_irq_of_init(struct device_node *n= ode, if (ret < 0) return ret; =20 - domain =3D irq_domain_add_legacy(node, dom_sz - min_irq, min_irq, min_irq, + domain =3D irq_domain_add_legacy_of_node(node, dom_sz - min_irq, min_irq,= min_irq, &jcore_aic_irqdomain_ops, &jcore_aic); if (!domain) diff --git a/drivers/irqchip/irq-keystone.c b/drivers/irqchip/irq-keystone.c index 808c781e2548..0d31aa5d5e99 100644 --- a/drivers/irqchip/irq-keystone.c +++ b/drivers/irqchip/irq-keystone.c @@ -164,7 +164,7 @@ static int keystone_irq_probe(struct platform_device *p= dev) kirq->chip.irq_mask =3D keystone_irq_setmask; kirq->chip.irq_unmask =3D keystone_irq_unmask; =20 - kirq->irqd =3D irq_domain_add_linear(np, KEYSTONE_N_IRQ, + kirq->irqd =3D irq_domain_add_linear_of_node(np, KEYSTONE_N_IRQ, &keystone_irq_ops, kirq); if (!kirq->irqd) { dev_err(dev, "IRQ domain registration failed\n"); diff --git a/drivers/irqchip/irq-lpc32xx.c b/drivers/irqchip/irq-lpc32xx.c index 4d70a857133f..f14f50510c0a 100644 --- a/drivers/irqchip/irq-lpc32xx.c +++ b/drivers/irqchip/irq-lpc32xx.c @@ -210,7 +210,7 @@ static int __init lpc32xx_of_ic_init(struct device_node= *node, return -EINVAL; } =20 - irqc->domain =3D irq_domain_add_linear(node, NR_LPC32XX_IC_IRQS, + irqc->domain =3D irq_domain_add_linear_of_node(node, NR_LPC32XX_IC_IRQS, &lpc32xx_irq_domain_ops, irqc); if (!irqc->domain) { pr_err("unable to add irq domain\n"); diff --git a/drivers/irqchip/irq-ls-extirq.c b/drivers/irqchip/irq-ls-extir= q.c index 139f26b0a6ef..dd0d4e9eeea7 100644 --- a/drivers/irqchip/irq-ls-extirq.c +++ b/drivers/irqchip/irq-ls-extirq.c @@ -208,7 +208,7 @@ ls_extirq_of_init(struct device_node *node, struct devi= ce_node *parent) of_device_is_compatible(node, "fsl,ls1043a-extirq"); raw_spin_lock_init(&priv->lock); =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, priv->nirq, node, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, priv->nirq,= node, &extirq_domain_ops, priv); if (!domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scf= g-msi.c index 12fc48555634..64bb8916a005 100644 --- a/drivers/irqchip/irq-ls-scfg-msi.c +++ b/drivers/irqchip/irq-ls-scfg-msi.c @@ -216,7 +216,7 @@ static void ls_scfg_msi_irq_handler(struct irq_desc *de= sc) static int ls_scfg_msi_domains_init(struct ls_scfg_msi *msi_data) { /* Initialize MSI domain parent */ - msi_data->parent =3D irq_domain_add_linear(NULL, + msi_data->parent =3D irq_domain_add_linear_of_node(NULL, msi_data->irqs_num, &ls_scfg_msi_domain_ops, msi_data); diff --git a/drivers/irqchip/irq-ls1x.c b/drivers/irqchip/irq-ls1x.c index 77a3f7dfaaf0..740dc38582f1 100644 --- a/drivers/irqchip/irq-ls1x.c +++ b/drivers/irqchip/irq-ls1x.c @@ -126,7 +126,7 @@ static int __init ls1x_intc_of_init(struct device_node = *node, } =20 /* Set up an IRQ domain */ - priv->domain =3D irq_domain_add_linear(node, 32, &irq_generic_chip_ops, + priv->domain =3D irq_domain_add_linear_of_node(node, 32, &irq_generic_chi= p_ops, NULL); if (!priv->domain) { pr_err("ls1x-irq: cannot add IRQ domain\n"); diff --git a/drivers/irqchip/irq-mchp-eic.c b/drivers/irqchip/irq-mchp-eic.c index 5dcd94c000a2..fccd5a118df5 100644 --- a/drivers/irqchip/irq-mchp-eic.c +++ b/drivers/irqchip/irq-mchp-eic.c @@ -248,7 +248,7 @@ static int mchp_eic_init(struct device_node *node, stru= ct device_node *parent) eic->irqs[i] =3D irq.args[1]; } =20 - eic->domain =3D irq_domain_add_hierarchy(parent_domain, 0, MCHP_EIC_NIRQ, + eic->domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, MCHP_E= IC_NIRQ, node, &mchp_eic_domain_ops, eic); if (!eic->domain) { pr_err("%pOF: Failed to add domain\n", node); diff --git a/drivers/irqchip/irq-mips-cpu.c b/drivers/irqchip/irq-mips-cpu.c index 0c7ae71a0af0..818d79db02ce 100644 --- a/drivers/irqchip/irq-mips-cpu.c +++ b/drivers/irqchip/irq-mips-cpu.c @@ -238,7 +238,7 @@ static void mips_cpu_register_ipi_domain(struct device_= node *of_node) struct cpu_ipi_domain_state *ipi_domain_state; =20 ipi_domain_state =3D kzalloc(sizeof(*ipi_domain_state), GFP_KERNEL); - ipi_domain =3D irq_domain_add_hierarchy(irq_domain, + ipi_domain =3D irq_domain_add_hierarchy_of_node(irq_domain, IRQ_DOMAIN_FLAG_IPI_SINGLE, 2, of_node, &mips_cpu_ipi_chip_ops, @@ -260,7 +260,7 @@ static void __init __mips_cpu_irq_init(struct device_no= de *of_node) clear_c0_status(ST0_IM); clear_c0_cause(CAUSEF_IP); =20 - irq_domain =3D irq_domain_add_legacy(of_node, 8, MIPS_CPU_IRQ_BASE, 0, + irq_domain =3D irq_domain_add_legacy_of_node(of_node, 8, MIPS_CPU_IRQ_BAS= E, 0, &mips_cpu_intc_irq_domain_ops, NULL); if (!irq_domain) diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index bca8053864b2..9082c1effa65 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c @@ -841,7 +841,7 @@ static int gic_register_ipi_domain(struct device_node *= node) struct irq_domain *gic_ipi_domain; unsigned int v[2], num_ipis; =20 - gic_ipi_domain =3D irq_domain_add_hierarchy(gic_irq_domain, + gic_ipi_domain =3D irq_domain_add_hierarchy_of_node(gic_irq_domain, IRQ_DOMAIN_FLAG_IPI_PER_CPU, GIC_NUM_LOCAL_INTRS + gic_shared_intrs, node, &gic_ipi_domain_ops, NULL); @@ -963,7 +963,7 @@ static int __init gic_of_init(struct device_node *node, gic_irq_dispatch); } =20 - gic_irq_domain =3D irq_domain_add_simple(node, GIC_NUM_LOCAL_INTRS + + gic_irq_domain =3D irq_domain_add_simple_of_node(node, GIC_NUM_LOCAL_INTR= S + gic_shared_intrs, 0, &gic_irq_domain_ops, NULL); if (!gic_irq_domain) { diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c index 25cf4f80e767..af888d9fcfda 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/drivers/irqchip/irq-mmp.c @@ -261,7 +261,7 @@ static int __init mmp_init_bases(struct device_node *no= de) } =20 icu_data[0].virq_base =3D 0; - icu_data[0].domain =3D irq_domain_add_linear(node, nr_irqs, + icu_data[0].domain =3D irq_domain_add_linear_of_node(node, nr_irqs, &mmp_irq_domain_ops, &icu_data[0]); for (irq =3D 0; irq < nr_irqs; irq++) { @@ -391,7 +391,7 @@ static int __init mmp2_mux_of_init(struct device_node *= node, return -EINVAL; =20 icu_data[i].virq_base =3D 0; - icu_data[i].domain =3D irq_domain_add_linear(node, nr_irqs, + icu_data[i].domain =3D irq_domain_add_linear_of_node(node, nr_irqs, &mmp_irq_domain_ops, &icu_data[i]); for (irq =3D 0; irq < nr_irqs; irq++) { diff --git a/drivers/irqchip/irq-mscc-ocelot.c b/drivers/irqchip/irq-mscc-o= celot.c index 3dc745b14caf..31fb6e9c63ed 100644 --- a/drivers/irqchip/irq-mscc-ocelot.c +++ b/drivers/irqchip/irq-mscc-ocelot.c @@ -132,7 +132,7 @@ static int __init vcoreiii_irq_init(struct device_node = *node, if (!parent_irq) return -EINVAL; =20 - domain =3D irq_domain_add_linear(node, p->n_irq, + domain =3D irq_domain_add_linear_of_node(node, p->n_irq, &irq_generic_chip_ops, NULL); if (!domain) { pr_err("%pOFn: unable to add irq domain\n", node); diff --git a/drivers/irqchip/irq-mst-intc.c b/drivers/irqchip/irq-mst-intc.c index f6133ae28155..21b78e6dbb02 100644 --- a/drivers/irqchip/irq-mst-intc.c +++ b/drivers/irqchip/irq-mst-intc.c @@ -273,7 +273,7 @@ static int __init mst_intc_of_init(struct device_node *= dn, raw_spin_lock_init(&cd->lock); cd->irq_start =3D irq_start; cd->nr_irqs =3D irq_end - irq_start + 1; - domain =3D irq_domain_add_hierarchy(domain_parent, 0, cd->nr_irqs, dn, + domain =3D irq_domain_add_hierarchy_of_node(domain_parent, 0, cd->nr_irqs= , dn, &mst_intc_domain_ops, cd); if (!domain) { iounmap(cd->base); diff --git a/drivers/irqchip/irq-mtk-cirq.c b/drivers/irqchip/irq-mtk-cirq.c index 76bc0283e3b9..3673848886ac 100644 --- a/drivers/irqchip/irq-mtk-cirq.c +++ b/drivers/irqchip/irq-mtk-cirq.c @@ -336,7 +336,7 @@ static int __init mtk_cirq_of_init(struct device_node *= node, cirq_data->offsets =3D match->data; =20 irq_num =3D cirq_data->ext_irq_end - cirq_data->ext_irq_start + 1; - domain =3D irq_domain_add_hierarchy(domain_parent, 0, + domain =3D irq_domain_add_hierarchy_of_node(domain_parent, 0, irq_num, node, &cirq_domain_ops, cirq_data); if (!domain) { diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sys= irq.c index 586e52d5442b..9bc644fd5bf0 100644 --- a/drivers/irqchip/irq-mtk-sysirq.c +++ b/drivers/irqchip/irq-mtk-sysirq.c @@ -207,7 +207,7 @@ static int __init mtk_sysirq_of_init(struct device_node= *node, chip_data->which_word[i] =3D word; } =20 - domain =3D irq_domain_add_hierarchy(domain_parent, 0, intpol_num, node, + domain =3D irq_domain_add_hierarchy_of_node(domain_parent, 0, intpol_num,= node, &sysirq_domain_ops, chip_data); if (!domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-mvebu-pic.c b/drivers/irqchip/irq-mvebu-pi= c.c index 3888b7585981..65ad777278e9 100644 --- a/drivers/irqchip/irq-mvebu-pic.c +++ b/drivers/irqchip/irq-mvebu-pic.c @@ -150,7 +150,7 @@ static int mvebu_pic_probe(struct platform_device *pdev) return -EINVAL; } =20 - pic->domain =3D irq_domain_add_linear(node, PIC_MAX_IRQS, + pic->domain =3D irq_domain_add_linear_of_node(node, PIC_MAX_IRQS, &mvebu_pic_domain_ops, pic); if (!pic->domain) { dev_err(&pdev->dev, "Failed to allocate irq domain\n"); diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index d67b5da38982..9a9e55311bb4 100644 --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c @@ -162,7 +162,7 @@ static const struct irq_domain_ops icoll_irq_domain_ops= =3D { static void __init icoll_add_domain(struct device_node *np, int num) { - icoll_domain =3D irq_domain_add_linear(np, num, + icoll_domain =3D irq_domain_add_linear_of_node(np, num, &icoll_irq_domain_ops, NULL); =20 if (!icoll_domain) diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c index ba6332b00a0a..6e2dd487086c 100644 --- a/drivers/irqchip/irq-nvic.c +++ b/drivers/irqchip/irq-nvic.c @@ -90,7 +90,7 @@ static int __init nvic_of_init(struct device_node *node, irqs =3D NVIC_MAX_IRQ; =20 nvic_irq_domain =3D - irq_domain_add_linear(node, irqs, &nvic_irq_domain_ops, NULL); + irq_domain_add_linear_of_node(node, irqs, &nvic_irq_domain_ops, NULL); =20 if (!nvic_irq_domain) { pr_warn("Failed to allocate irq domain\n"); diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-int= c.c index ad84a2f03368..ccc9eae8e035 100644 --- a/drivers/irqchip/irq-omap-intc.c +++ b/drivers/irqchip/irq-omap-intc.c @@ -248,7 +248,7 @@ static int __init omap_init_irq_of(struct device_node *= node) if (WARN_ON(!omap_irq_base)) return -ENOMEM; =20 - domain =3D irq_domain_add_linear(node, omap_nr_irqs, + domain =3D irq_domain_add_linear_of_node(node, omap_nr_irqs, &irq_generic_chip_ops, NULL); =20 omap_irq_soft_reset(); @@ -274,7 +274,7 @@ static int __init omap_init_irq_legacy(u32 base, struct= device_node *node) irq_base =3D 0; } =20 - domain =3D irq_domain_add_legacy(node, omap_nr_irqs, irq_base, 0, + domain =3D irq_domain_add_legacy_of_node(node, omap_nr_irqs, irq_base, 0, &irq_domain_simple_ops, NULL); =20 omap_irq_soft_reset(); diff --git a/drivers/irqchip/irq-or1k-pic.c b/drivers/irqchip/irq-or1k-pic.c index f289ccd95291..b10a16d759bb 100644 --- a/drivers/irqchip/irq-or1k-pic.c +++ b/drivers/irqchip/irq-or1k-pic.c @@ -144,7 +144,7 @@ static int __init or1k_pic_init(struct device_node *nod= e, /* Disable all interrupts until explicitly requested */ mtspr(SPR_PICMR, (0UL)); =20 - root_domain =3D irq_domain_add_linear(node, 32, &or1k_irq_domain_ops, + root_domain =3D irq_domain_add_linear_of_node(node, 32, &or1k_irq_domain_= ops, pic); =20 set_handle_irq(or1k_pic_handle_irq); diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c index 4e4e874e09a8..224ef54473e9 100644 --- a/drivers/irqchip/irq-orion.c +++ b/drivers/irqchip/irq-orion.c @@ -59,7 +59,7 @@ static int __init orion_irq_init(struct device_node *np, /* count number of irq chips by valid reg addresses */ num_chips =3D of_address_count(np); =20 - orion_irq_domain =3D irq_domain_add_linear(np, + orion_irq_domain =3D irq_domain_add_linear_of_node(np, num_chips * ORION_IRQS_PER_CHIP, &irq_generic_chip_ops, NULL); if (!orion_irq_domain) @@ -146,7 +146,7 @@ static int __init orion_bridge_irq_init(struct device_n= ode *np, /* get optional number of interrupts provided */ of_property_read_u32(np, "marvell,#interrupts", &nrirqs); =20 - domain =3D irq_domain_add_linear(np, nrirqs, + domain =3D irq_domain_add_linear_of_node(np, nrirqs, &irq_generic_chip_ops, NULL); if (!domain) { pr_err("%pOFn: unable to add irq domain\n", np); diff --git a/drivers/irqchip/irq-owl-sirq.c b/drivers/irqchip/irq-owl-sirq.c index 6e4127465094..80079d40a2ca 100644 --- a/drivers/irqchip/irq-owl-sirq.c +++ b/drivers/irqchip/irq-owl-sirq.c @@ -323,7 +323,7 @@ static int __init owl_sirq_init(const struct owl_sirq_p= arams *params, owl_sirq_clear_set_extctl(chip_data, 0, INTC_EXTCTL_CLK_SEL, i); } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, NUM_SIRQ, node, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, NUM_SIRQ, n= ode, &owl_sirq_domain_ops, chip_data); if (!domain) { pr_err("%pOF: failed to add domain\n", node); diff --git a/drivers/irqchip/irq-pic32-evic.c b/drivers/irqchip/irq-pic32-e= vic.c index b546b1036e12..44a164bc7dcf 100644 --- a/drivers/irqchip/irq-pic32-evic.c +++ b/drivers/irqchip/irq-pic32-evic.c @@ -227,7 +227,7 @@ static int __init pic32_of_init(struct device_node *nod= e, goto err_iounmap; } =20 - evic_irq_domain =3D irq_domain_add_linear(node, nchips * 32, + evic_irq_domain =3D irq_domain_add_linear_of_node(node, nchips * 32, &pic32_irq_domain_ops, priv); if (!evic_irq_domain) { diff --git a/drivers/irqchip/irq-pruss-intc.c b/drivers/irqchip/irq-pruss-i= ntc.c index bee01980b463..c532b37bda0b 100644 --- a/drivers/irqchip/irq-pruss-intc.c +++ b/drivers/irqchip/irq-pruss-intc.c @@ -555,7 +555,7 @@ static int pruss_intc_probe(struct platform_device *pde= v) =20 mutex_init(&intc->lock); =20 - intc->domain =3D irq_domain_add_linear(dev->of_node, max_system_events, + intc->domain =3D irq_domain_add_linear_of_node(dev->of_node, max_system_e= vents, &pruss_intc_irq_domain_ops, intc); if (!intc->domain) return -ENOMEM; diff --git a/drivers/irqchip/irq-realtek-rtl.c b/drivers/irqchip/irq-realte= k-rtl.c index 2a349082af81..6229da7a9427 100644 --- a/drivers/irqchip/irq-realtek-rtl.c +++ b/drivers/irqchip/irq-realtek-rtl.c @@ -162,7 +162,7 @@ static int __init realtek_rtl_of_init(struct device_nod= e *node, struct device_no else if (!parent_irq) return -ENODEV; =20 - domain =3D irq_domain_add_linear(node, RTL_ICTL_NUM_INPUTS, &irq_domain_o= ps, NULL); + domain =3D irq_domain_add_linear_of_node(node, RTL_ICTL_NUM_INPUTS, &irq_= domain_ops, NULL); if (!domain) return -ENOMEM; =20 diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/ir= q-renesas-intc-irqpin.c index 954419f2460d..4954d16afbb5 100644 --- a/drivers/irqchip/irq-renesas-intc-irqpin.c +++ b/drivers/irqchip/irq-renesas-intc-irqpin.c @@ -513,7 +513,7 @@ static int intc_irqpin_probe(struct platform_device *pd= ev) irq_chip->irq_set_wake =3D intc_irqpin_irq_set_wake; irq_chip->flags =3D IRQCHIP_MASK_ON_SUSPEND; =20 - p->irq_domain =3D irq_domain_add_simple(dev->of_node, nirqs, 0, + p->irq_domain =3D irq_domain_add_simple_of_node(dev->of_node, nirqs, 0, &intc_irqpin_irq_domain_ops, p); if (!p->irq_domain) { ret =3D -ENXIO; diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renes= as-irqc.c index cbce8ffc7de4..aafd41c2e5e6 100644 --- a/drivers/irqchip/irq-renesas-irqc.c +++ b/drivers/irqchip/irq-renesas-irqc.c @@ -168,7 +168,7 @@ static int irqc_probe(struct platform_device *pdev) =20 p->cpu_int_base =3D p->iomem + IRQC_INT_CPU_BASE(0); /* SYS-SPI */ =20 - p->irq_domain =3D irq_domain_add_linear(dev->of_node, p->number_of_irqs, + p->irq_domain =3D irq_domain_add_linear_of_node(dev->of_node, p->number_o= f_irqs, &irq_generic_chip_ops, p); if (!p->irq_domain) { ret =3D -ENXIO; diff --git a/drivers/irqchip/irq-renesas-rza1.c b/drivers/irqchip/irq-renes= as-rza1.c index d4e6a68889ec..540f76a077d4 100644 --- a/drivers/irqchip/irq-renesas-rza1.c +++ b/drivers/irqchip/irq-renesas-rza1.c @@ -231,7 +231,7 @@ static int rza1_irqc_probe(struct platform_device *pdev) priv->chip.irq_set_type =3D rza1_irqc_set_type; priv->chip.flags =3D IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE; =20 - priv->irq_domain =3D irq_domain_add_hierarchy(parent, 0, IRQC_NUM_IRQ, + priv->irq_domain =3D irq_domain_add_hierarchy_of_node(parent, 0, IRQC_NUM= _IRQ, np, &rza1_irqc_domain_ops, priv); if (!priv->irq_domain) { diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-rene= sas-rzg2l.c index 99e27e01b0b1..0f81f094371b 100644 --- a/drivers/irqchip/irq-renesas-rzg2l.c +++ b/drivers/irqchip/irq-renesas-rzg2l.c @@ -581,7 +581,7 @@ static int rzg2l_irqc_common_init(struct device_node *n= ode, struct device_node * =20 raw_spin_lock_init(&rzg2l_irqc_data->lock); =20 - irq_domain =3D irq_domain_add_hierarchy(parent_domain, 0, IRQC_NUM_IRQ, + irq_domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, IRQC_NU= M_IRQ, node, &rzg2l_irqc_domain_ops, rzg2l_irqc_data); if (!irq_domain) { diff --git a/drivers/irqchip/irq-renesas-rzv2h.c b/drivers/irqchip/irq-rene= sas-rzv2h.c index fe2d29e91026..0593fb843a61 100644 --- a/drivers/irqchip/irq-renesas-rzv2h.c +++ b/drivers/irqchip/irq-renesas-rzv2h.c @@ -481,7 +481,7 @@ static int rzv2h_icu_init(struct device_node *node, str= uct device_node *parent) =20 raw_spin_lock_init(&rzv2h_icu_data->lock); =20 - irq_domain =3D irq_domain_add_hierarchy(parent_domain, 0, ICU_NUM_IRQ, no= de, + irq_domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, ICU_NUM= _IRQ, node, &rzv2h_icu_domain_ops, rzv2h_icu_data); if (!irq_domain) { dev_err(&pdev->dev, "failed to add irq domain\n"); diff --git a/drivers/irqchip/irq-sa11x0.c b/drivers/irqchip/irq-sa11x0.c index 9d0b80271949..26e83111d1fd 100644 --- a/drivers/irqchip/irq-sa11x0.c +++ b/drivers/irqchip/irq-sa11x0.c @@ -162,7 +162,7 @@ void __init sa11x0_init_irq_nodt(int irq_start, resourc= e_size_t io_start) */ writel_relaxed(1, iobase + ICCR); =20 - sa1100_normal_irqdomain =3D irq_domain_add_simple(NULL, + sa1100_normal_irqdomain =3D irq_domain_add_simple_of_node(NULL, 32, irq_start, &sa1100_normal_irqdomain_ops, NULL); =20 diff --git a/drivers/irqchip/irq-sni-exiu.c b/drivers/irqchip/irq-sni-exiu.c index 7d10bf6e5824..75a1db427c83 100644 --- a/drivers/irqchip/irq-sni-exiu.c +++ b/drivers/irqchip/irq-sni-exiu.c @@ -253,7 +253,7 @@ static int __init exiu_dt_init(struct device_node *node, if (IS_ERR(data)) return PTR_ERR(data); =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, NUM_IRQS, node, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, NUM_IRQS, n= ode, &exiu_domain_ops, data); if (!domain) { pr_err("%pOF: failed to allocate domain\n", node); diff --git a/drivers/irqchip/irq-sp7021-intc.c b/drivers/irqchip/irq-sp7021= -intc.c index bed78d1def3d..0152c1507dce 100644 --- a/drivers/irqchip/irq-sp7021-intc.c +++ b/drivers/irqchip/irq-sp7021-intc.c @@ -256,7 +256,7 @@ static int __init sp_intc_init_dt(struct device_node *n= ode, struct device_node * writel_relaxed(~0, REG_INTR_CLEAR + i * 4); } =20 - sp_intc.domain =3D irq_domain_add_linear(node, SP_INTC_NR_IRQS, + sp_intc.domain =3D irq_domain_add_linear_of_node(node, SP_INTC_NR_IRQS, &sp_intc_dm_ops, &sp_intc); if (!sp_intc.domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-starfive-jh8100-intc.c b/drivers/irqchip/i= rq-starfive-jh8100-intc.c index 0f5837176e53..fcffad01305f 100644 --- a/drivers/irqchip/irq-starfive-jh8100-intc.c +++ b/drivers/irqchip/irq-starfive-jh8100-intc.c @@ -158,7 +158,7 @@ static int __init starfive_intc_init(struct device_node= *intc, =20 raw_spin_lock_init(&irqc->lock); =20 - irqc->domain =3D irq_domain_add_linear(intc, STARFIVE_INTC_SRC_IRQ_NUM, + irqc->domain =3D irq_domain_add_linear_of_node(intc, STARFIVE_INTC_SRC_IR= Q_NUM, &starfive_intc_domain_ops, irqc); if (!irqc->domain) { pr_err("Unable to create IRQ domain\n"); diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-e= xti.c index 7c6a0080c330..50f576c5b01b 100644 --- a/drivers/irqchip/irq-stm32-exti.c +++ b/drivers/irqchip/irq-stm32-exti.c @@ -344,7 +344,7 @@ static int __init stm32_exti_init(const struct stm32_ex= ti_drv_data *drv_data, if (!host_data) return -ENOMEM; =20 - domain =3D irq_domain_add_linear(node, drv_data->bank_nr * IRQS_PER_BANK, + domain =3D irq_domain_add_linear_of_node(node, drv_data->bank_nr * IRQS_P= ER_BANK, &irq_exti_domain_ops, NULL); if (!domain) { pr_err("%pOFn: Could not register interrupt domain.\n", diff --git a/drivers/irqchip/irq-stm32mp-exti.c b/drivers/irqchip/irq-stm32= mp-exti.c index 649b84f12efc..a396bfc519f0 100644 --- a/drivers/irqchip/irq-stm32mp-exti.c +++ b/drivers/irqchip/irq-stm32mp-exti.c @@ -682,7 +682,7 @@ static int stm32mp_exti_probe(struct platform_device *p= dev) return -EINVAL; } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, drv_data->bank_nr * IRQS_PER_BANK, np, &stm32mp_exti_domain_ops, host_data); diff --git a/drivers/irqchip/irq-sun4i.c b/drivers/irqchip/irq-sun4i.c index dd506ebfdacb..952a47740333 100644 --- a/drivers/irqchip/irq-sun4i.c +++ b/drivers/irqchip/irq-sun4i.c @@ -133,7 +133,7 @@ static int __init sun4i_of_init(struct device_node *nod= e, /* Configure the external interrupt source type */ writel(0x00, irq_ic_data->irq_base + SUN4I_IRQ_NMI_CTRL_REG); =20 - irq_ic_data->irq_domain =3D irq_domain_add_linear(node, 3 * 32, + irq_ic_data->irq_domain =3D irq_domain_add_linear_of_node(node, 3 * 32, &sun4i_irq_ops, NULL); if (!irq_ic_data->irq_domain) panic("%pOF: unable to create IRQ domain\n", node); diff --git a/drivers/irqchip/irq-sun6i-r.c b/drivers/irqchip/irq-sun6i-r.c index 99958d470d62..26d57f1c048c 100644 --- a/drivers/irqchip/irq-sun6i-r.c +++ b/drivers/irqchip/irq-sun6i-r.c @@ -338,7 +338,7 @@ static int __init sun6i_r_intc_init(struct device_node = *node, return PTR_ERR(base); } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, 0, node, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, 0, node, &sun6i_r_intc_domain_ops, NULL); if (!domain) { pr_err("%pOF: Failed to allocate domain\n", node); diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nm= i.c index bb92fd85e975..d3642a2a6975 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c @@ -152,7 +152,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_n= ode *node, int ret; =20 =20 - domain =3D irq_domain_add_linear(node, 1, &irq_generic_chip_ops, NULL); + domain =3D irq_domain_add_linear_of_node(node, 1, &irq_generic_chip_ops, = NULL); if (!domain) { pr_err("Could not register interrupt domain.\n"); return -ENOMEM; diff --git a/drivers/irqchip/irq-tb10x.c b/drivers/irqchip/irq-tb10x.c index d59bfbe8c6d0..51e9a25dead4 100644 --- a/drivers/irqchip/irq-tb10x.c +++ b/drivers/irqchip/irq-tb10x.c @@ -121,7 +121,7 @@ static int __init of_tb10x_init_irq(struct device_node = *ictl, goto ioremap_fail; } =20 - domain =3D irq_domain_add_linear(ictl, AB_IRQCTL_MAXIRQ, + domain =3D irq_domain_add_linear_of_node(ictl, AB_IRQCTL_MAXIRQ, &irq_generic_chip_ops, NULL); if (!domain) { ret =3D -ENOMEM; diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c index ad3e2c1b3c87..f64d4e3734a6 100644 --- a/drivers/irqchip/irq-tegra.c +++ b/drivers/irqchip/irq-tegra.c @@ -330,7 +330,7 @@ static int __init tegra_ictlr_init(struct device_node *= node, node, num_ictlrs, soc->num_ictlrs); =20 =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, num_ictlrs * 32, + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, num_ictlrs = * 32, node, &tegra_ictlr_domain_ops, lic); if (!domain) { diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci= -inta.c index 6c9e2bb99a96..7e071cefbc7f 100644 --- a/drivers/irqchip/irq-ti-sci-inta.c +++ b/drivers/irqchip/irq-ti-sci-inta.c @@ -701,7 +701,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform= _device *pdev) if (ret) return ret; =20 - domain =3D irq_domain_add_linear(dev_of_node(dev), + domain =3D irq_domain_add_linear_of_node(dev_of_node(dev), ti_sci_get_num_resources(inta->vint), &ti_sci_inta_irq_domain_ops, inta); if (!domain) { diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci= -intr.c index 930313ed772d..74bc81e01f01 100644 --- a/drivers/irqchip/irq-ti-sci-intr.c +++ b/drivers/irqchip/irq-ti-sci-intr.c @@ -274,7 +274,7 @@ static int ti_sci_intr_irq_domain_probe(struct platform= _device *pdev) return PTR_ERR(intr->out_irqs); } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, 0, dev_of_node(dev), + domain =3D irq_domain_add_hierarchy_of_node(parent_domain, 0, 0, dev_of_n= ode(dev), &ti_sci_intr_irq_domain_ops, intr); if (!domain) { dev_err(dev, "Failed to allocate IRQ domain\n"); diff --git a/drivers/irqchip/irq-ts4800.c b/drivers/irqchip/irq-ts4800.c index cc219f28d317..b24f6efad73f 100644 --- a/drivers/irqchip/irq-ts4800.c +++ b/drivers/irqchip/irq-ts4800.c @@ -125,7 +125,7 @@ static int ts4800_ic_probe(struct platform_device *pdev) return -EINVAL; } =20 - data->domain =3D irq_domain_add_linear(node, 8, &ts4800_ic_ops, data); + data->domain =3D irq_domain_add_linear_of_node(node, 8, &ts4800_ic_ops, d= ata); if (!data->domain) { dev_err(&pdev->dev, "cannot add IRQ domain\n"); return -ENOMEM; diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-ver= satile-fpga.c index 0abc8934c2ee..da83cd2be928 100644 --- a/drivers/irqchip/irq-versatile-fpga.c +++ b/drivers/irqchip/irq-versatile-fpga.c @@ -176,7 +176,7 @@ static void __init fpga_irq_init(void __iomem *base, in= t parent_irq, f); } =20 - f->domain =3D irq_domain_add_linear(node, fls(valid), + f->domain =3D irq_domain_add_linear_of_node(node, fls(valid), &fpga_irqdomain_ops, f); =20 /* This will allocate all valid descriptors in the linear case */ diff --git a/drivers/irqchip/irq-vf610-mscm-ir.c b/drivers/irqchip/irq-vf61= 0-mscm-ir.c index 2b9a8ba58e26..6a3b029d7f65 100644 --- a/drivers/irqchip/irq-vf610-mscm-ir.c +++ b/drivers/irqchip/irq-vf610-mscm-ir.c @@ -209,7 +209,7 @@ static int __init vf610_mscm_ir_of_init(struct device_n= ode *node, regmap_read(mscm_cp_regmap, MSCM_CPxNUM, &cpuid); mscm_ir_data->cpu_mask =3D 0x1 << cpuid; =20 - domain =3D irq_domain_add_hierarchy(domain_parent, 0, + domain =3D irq_domain_add_hierarchy_of_node(domain_parent, 0, MSCM_IRSPRC_NUM, node, &mscm_irq_domain_ops, mscm_ir_data); if (!domain) { diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index ea93e7236c4a..1fa865d949cb 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c @@ -289,7 +289,7 @@ static void __init vic_register(void __iomem *base, uns= igned int parent_irq, vic_handle_irq_cascaded, v); } =20 - v->domain =3D irq_domain_add_simple(node, fls(valid_sources), irq, + v->domain =3D irq_domain_add_simple_of_node(node, fls(valid_sources), irq, &vic_irqdomain_ops, v); /* create an IRQ mapping for each valid IRQ */ for (i =3D 0; i < fls(valid_sources); i++) diff --git a/drivers/irqchip/irq-vt8500.c b/drivers/irqchip/irq-vt8500.c index e17dd3a8c2d5..b24504c8ae0d 100644 --- a/drivers/irqchip/irq-vt8500.c +++ b/drivers/irqchip/irq-vt8500.c @@ -200,7 +200,7 @@ static int __init vt8500_irq_init(struct device_node *n= ode, } =20 intc[active_cnt].base =3D of_iomap(np, 0); - intc[active_cnt].domain =3D irq_domain_add_linear(node, 64, + intc[active_cnt].domain =3D irq_domain_add_linear_of_node(node, 64, &vt8500_irq_domain_ops, &intc[active_cnt]); =20 if (!intc[active_cnt].base) { diff --git a/drivers/irqchip/irq-wpcm450-aic.c b/drivers/irqchip/irq-wpcm45= 0-aic.c index 91df62a64cd9..0d24f13a2a70 100644 --- a/drivers/irqchip/irq-wpcm450-aic.c +++ b/drivers/irqchip/irq-wpcm450-aic.c @@ -154,7 +154,7 @@ static int __init wpcm450_aic_of_init(struct device_nod= e *node, =20 set_handle_irq(wpcm450_aic_handle_irq); =20 - aic->domain =3D irq_domain_add_linear(node, AIC_NUM_IRQS, &wpcm450_aic_op= s, aic); + aic->domain =3D irq_domain_add_linear_of_node(node, AIC_NUM_IRQS, &wpcm45= 0_aic_ops, aic); =20 return 0; } diff --git a/drivers/irqchip/irq-xilinx-intc.c b/drivers/irqchip/irq-xilinx= -intc.c index 38727e9cc713..11f79e37b7b0 100644 --- a/drivers/irqchip/irq-xilinx-intc.c +++ b/drivers/irqchip/irq-xilinx-intc.c @@ -212,7 +212,7 @@ static int __init xilinx_intc_of_init(struct device_nod= e *intc, xintc_write(irqc, MER, MER_HIE | MER_ME); } =20 - irqc->root_domain =3D irq_domain_add_linear(intc, irqc->nr_irq, + irqc->root_domain =3D irq_domain_add_linear_of_node(intc, irqc->nr_irq, &xintc_irq_domain_ops, irqc); if (!irqc->root_domain) { pr_err("irq-xilinx: Unable to create IRQ domain\n"); diff --git a/drivers/irqchip/irq-xtensa-mx.c b/drivers/irqchip/irq-xtensa-m= x.c index 9b441d180299..4fb96943f1b5 100644 --- a/drivers/irqchip/irq-xtensa-mx.c +++ b/drivers/irqchip/irq-xtensa-mx.c @@ -167,7 +167,7 @@ static void __init xtensa_mx_init_common(struct irq_dom= ain *root_domain) int __init xtensa_mx_init_legacy(struct device_node *interrupt_parent) { struct irq_domain *root_domain =3D - irq_domain_add_legacy(NULL, NR_IRQS - 1, 1, 0, + irq_domain_add_legacy_of_node(NULL, NR_IRQS - 1, 1, 0, &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip); xtensa_mx_init_common(root_domain); @@ -178,7 +178,7 @@ static int __init xtensa_mx_init(struct device_node *np, struct device_node *interrupt_parent) { struct irq_domain *root_domain =3D - irq_domain_add_linear(np, NR_IRQS, &xtensa_mx_irq_domain_ops, + irq_domain_add_linear_of_node(np, NR_IRQS, &xtensa_mx_irq_domain_ops, &xtensa_mx_irq_chip); xtensa_mx_init_common(root_domain); return 0; diff --git a/drivers/irqchip/irq-xtensa-pic.c b/drivers/irqchip/irq-xtensa-= pic.c index 9be7b7c5cd23..9205506877cb 100644 --- a/drivers/irqchip/irq-xtensa-pic.c +++ b/drivers/irqchip/irq-xtensa-pic.c @@ -85,7 +85,7 @@ static struct irq_chip xtensa_irq_chip =3D { int __init xtensa_pic_init_legacy(struct device_node *interrupt_parent) { struct irq_domain *root_domain =3D - irq_domain_add_legacy(NULL, NR_IRQS - 1, 1, 0, + irq_domain_add_legacy_of_node(NULL, NR_IRQS - 1, 1, 0, &xtensa_irq_domain_ops, &xtensa_irq_chip); irq_set_default_domain(root_domain); return 0; @@ -95,7 +95,7 @@ static int __init xtensa_pic_init(struct device_node *np, struct device_node *interrupt_parent) { struct irq_domain *root_domain =3D - irq_domain_add_linear(np, NR_IRQS, &xtensa_irq_domain_ops, + irq_domain_add_linear_of_node(np, NR_IRQS, &xtensa_irq_domain_ops, &xtensa_irq_chip); irq_set_default_domain(root_domain); return 0; diff --git a/drivers/irqchip/irq-zevio.c b/drivers/irqchip/irq-zevio.c index 7a72620fc478..005dcb58a5b7 100644 --- a/drivers/irqchip/irq-zevio.c +++ b/drivers/irqchip/irq-zevio.c @@ -92,7 +92,7 @@ static int __init zevio_of_init(struct device_node *node, zevio_init_irq_base(zevio_irq_io + IO_IRQ_BASE); zevio_init_irq_base(zevio_irq_io + IO_FIQ_BASE); =20 - zevio_irq_domain =3D irq_domain_add_linear(node, MAX_INTRS, + zevio_irq_domain =3D irq_domain_add_linear_of_node(node, MAX_INTRS, &irq_generic_chip_ops, NULL); BUG_ON(!zevio_irq_domain); =20 diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c index 7c17a6f643ef..bbd4c53a9f6c 100644 --- a/drivers/irqchip/spear-shirq.c +++ b/drivers/irqchip/spear-shirq.c @@ -239,7 +239,7 @@ static int __init shirq_init(struct spear_shirq **shirq= _blocks, int block_nr, goto err_unmap; } =20 - shirq_domain =3D irq_domain_add_legacy(np, nr_irqs, virq_base, 0, + shirq_domain =3D irq_domain_add_legacy_of_node(np, nr_irqs, virq_base, 0, &irq_domain_simple_ops, NULL); if (WARN_ON(!shirq_domain)) { pr_warn("%s: irq domain init failed\n", __func__); diff --git a/drivers/mailbox/qcom-ipcc.c b/drivers/mailbox/qcom-ipcc.c index 14c7907c6632..18ffa77ba866 100644 --- a/drivers/mailbox/qcom-ipcc.c +++ b/drivers/mailbox/qcom-ipcc.c @@ -296,7 +296,7 @@ static int qcom_ipcc_probe(struct platform_device *pdev) if (!name) return -ENOMEM; =20 - ipcc->irq_domain =3D irq_domain_add_tree(pdev->dev.of_node, + ipcc->irq_domain =3D irq_domain_add_tree_of_node(pdev->dev.of_node, &qcom_ipcc_irq_ops, ipcc); if (!ipcc->irq_domain) return -ENOMEM; diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index e2a75a52563f..5fa3d90f0028 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -1455,7 +1455,7 @@ static int gpmc_setup_irq(struct gpmc_device *gpmc) gpmc->irq_chip.irq_unmask =3D gpmc_irq_unmask; gpmc->irq_chip.irq_set_type =3D gpmc_irq_set_type; =20 - gpmc_irq_domain =3D irq_domain_add_linear(gpmc->dev->of_node, + gpmc_irq_domain =3D irq_domain_add_linear_of_node(gpmc->dev->of_node, gpmc->nirqs, &gpmc_irq_domain_ops, gpmc); diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index 8e68b64bd7f8..c593c4b41f17 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -624,7 +624,7 @@ static int device_irq_init(struct pm860x_chip *chip, ret =3D -EBUSY; goto out; } - irq_domain_add_legacy(node, nr_irqs, chip->irq_base, 0, + irq_domain_add_legacy_of_node(node, nr_irqs, chip->irq_base, 0, &pm860x_irq_domain_ops, chip); chip->core_irq =3D i2c->irq; if (!chip->core_irq) diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index 15c95828b09a..656c56504009 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -580,7 +580,7 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struc= t device_node *np) num_irqs =3D AB8500_NR_IRQS; =20 /* If ->irq_base is zero this will give a linear mapping */ - ab8500->domain =3D irq_domain_add_simple(ab8500->dev->of_node, + ab8500->domain =3D irq_domain_add_simple_of_node(ab8500->dev->of_node, num_irqs, 0, &ab8500_irq_ops, ab8500); =20 diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c index d919ae9691e2..83fcf54afecb 100644 --- a/drivers/mfd/arizona-irq.c +++ b/drivers/mfd/arizona-irq.c @@ -312,7 +312,7 @@ int arizona_irq_init(struct arizona *arizona) flags |=3D arizona->pdata.irq_flags; =20 /* Allocate a virtual IRQ domain to distribute to the regmap domains */ - arizona->virq =3D irq_domain_add_linear(NULL, 2, &arizona_domain_ops, + arizona->virq =3D irq_domain_add_linear_of_node(NULL, 2, &arizona_domain_= ops, arizona); if (!arizona->virq) { dev_err(arizona->dev, "Failed to add core IRQ domain\n"); diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 5b3e355e78f6..806d652eeb20 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2607,7 +2607,7 @@ static int db8500_irq_init(struct device_node *np) { int i; =20 - db8500_irq_domain =3D irq_domain_add_simple( + db8500_irq_domain =3D irq_domain_add_simple_of_node( np, NUM_PRCMU_WAKEUPS, 0, &db8500_irq_ops, NULL); =20 diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c index 6fe388da6fb6..fe6e2b51ef6c 100644 --- a/drivers/mfd/fsl-imx25-tsadc.c +++ b/drivers/mfd/fsl-imx25-tsadc.c @@ -72,7 +72,7 @@ static int mx25_tsadc_setup_irq(struct platform_device *p= dev, if (irq < 0) return irq; =20 - tsadc->domain =3D irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, + tsadc->domain =3D irq_domain_add_simple_of_node(np, 2, 0, &mx25_tsadc_dom= ain_ops, tsadc); if (!tsadc->domain) { dev_err(dev, "Failed to add irq domain\n"); diff --git a/drivers/mfd/lp8788-irq.c b/drivers/mfd/lp8788-irq.c index 39006297f3d2..724f82c2a6bf 100644 --- a/drivers/mfd/lp8788-irq.c +++ b/drivers/mfd/lp8788-irq.c @@ -161,7 +161,7 @@ int lp8788_irq_init(struct lp8788 *lp, int irq) return -ENOMEM; =20 irqd->lp =3D lp; - irqd->domain =3D irq_domain_add_linear(lp->dev->of_node, LP8788_INT_MAX, + irqd->domain =3D irq_domain_add_linear_of_node(lp->dev->of_node, LP8788_I= NT_MAX, &lp8788_domain_ops, irqd); if (!irqd->domain) { dev_err(lp->dev, "failed to add irq domain err\n"); diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c index 105d79b91493..110e2ba1119c 100644 --- a/drivers/mfd/max8925-core.c +++ b/drivers/mfd/max8925-core.c @@ -682,7 +682,7 @@ static int max8925_irq_init(struct max8925_chip *chip, = int irq, return -EBUSY; } =20 - irq_domain_add_legacy(node, MAX8925_NR_IRQS, chip->irq_base, 0, + irq_domain_add_legacy_of_node(node, MAX8925_NR_IRQS, chip->irq_base, 0, &max8925_irq_domain_ops, chip); =20 /* request irq handler for pmic main irq*/ diff --git a/drivers/mfd/max8997-irq.c b/drivers/mfd/max8997-irq.c index 93a3b1698d9c..c253ff646bea 100644 --- a/drivers/mfd/max8997-irq.c +++ b/drivers/mfd/max8997-irq.c @@ -327,7 +327,7 @@ int max8997_irq_init(struct max8997_dev *max8997) true : false; } =20 - domain =3D irq_domain_add_linear(NULL, MAX8997_IRQ_NR, + domain =3D irq_domain_add_linear_of_node(NULL, MAX8997_IRQ_NR, &max8997_irq_domain_ops, max8997); if (!domain) { dev_err(max8997->dev, "could not create irq domain\n"); diff --git a/drivers/mfd/max8998-irq.c b/drivers/mfd/max8998-irq.c index 83b6f510bc05..c6560e4f9ac3 100644 --- a/drivers/mfd/max8998-irq.c +++ b/drivers/mfd/max8998-irq.c @@ -230,7 +230,7 @@ int max8998_irq_init(struct max8998_dev *max8998) max8998_write_reg(max8998->i2c, MAX8998_REG_STATUSM1, 0xff); max8998_write_reg(max8998->i2c, MAX8998_REG_STATUSM2, 0xff); =20 - domain =3D irq_domain_add_simple(NULL, MAX8998_IRQ_NR, + domain =3D irq_domain_add_simple_of_node(NULL, MAX8998_IRQ_NR, max8998->irq_base, &max8998_irq_domain_ops, max8998); if (!domain) { dev_err(max8998->dev, "could not create irq domain\n"); diff --git a/drivers/mfd/mt6358-irq.c b/drivers/mfd/mt6358-irq.c index 49830b526ee8..391bd1a7556f 100644 --- a/drivers/mfd/mt6358-irq.c +++ b/drivers/mfd/mt6358-irq.c @@ -272,7 +272,7 @@ int mt6358_irq_init(struct mt6397_chip *chip) irqd->pmic_ints[i].en_reg_shift * j, 0); } =20 - chip->irq_domain =3D irq_domain_add_linear(chip->dev->of_node, + chip->irq_domain =3D irq_domain_add_linear_of_node(chip->dev->of_node, irqd->num_pmic_irqs, &mt6358_irq_domain_ops, chip); if (!chip->irq_domain) { diff --git a/drivers/mfd/mt6397-irq.c b/drivers/mfd/mt6397-irq.c index 1310665200ed..069521a6421b 100644 --- a/drivers/mfd/mt6397-irq.c +++ b/drivers/mfd/mt6397-irq.c @@ -216,7 +216,7 @@ int mt6397_irq_init(struct mt6397_chip *chip) regmap_write(chip->regmap, chip->int_con[2], 0x0); =20 chip->pm_nb.notifier_call =3D mt6397_irq_pm_notifier; - chip->irq_domain =3D irq_domain_add_linear(chip->dev->of_node, + chip->irq_domain =3D irq_domain_add_linear_of_node(chip->dev->of_node, MT6397_IRQ_NR, &mt6397_irq_domain_ops, chip); diff --git a/drivers/mfd/qcom-pm8xxx.c b/drivers/mfd/qcom-pm8xxx.c index f9ebdf5845b8..b2a57d1063c9 100644 --- a/drivers/mfd/qcom-pm8xxx.c +++ b/drivers/mfd/qcom-pm8xxx.c @@ -559,7 +559,7 @@ static int pm8xxx_probe(struct platform_device *pdev) chip->pm_irq_data =3D data; spin_lock_init(&chip->pm_irq_lock); =20 - chip->irqdomain =3D irq_domain_add_linear(pdev->dev.of_node, + chip->irqdomain =3D irq_domain_add_linear_of_node(pdev->dev.of_node, data->num_irqs, &pm8xxx_irq_domain_ops, chip); diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c index f391c2ccaa72..e3238ec3cb9d 100644 --- a/drivers/mfd/stmfx.c +++ b/drivers/mfd/stmfx.c @@ -269,7 +269,7 @@ static int stmfx_irq_init(struct i2c_client *client) u32 irqoutpin =3D 0, irqtrigger; int ret; =20 - stmfx->irq_domain =3D irq_domain_add_simple(stmfx->dev->of_node, + stmfx->irq_domain =3D irq_domain_add_simple_of_node(stmfx->dev->of_node, STMFX_REG_IRQ_SRC_MAX, 0, &stmfx_irq_ops, stmfx); if (!stmfx->irq_domain) { diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c index 9c3cf58457a7..9bda909438b2 100644 --- a/drivers/mfd/stmpe.c +++ b/drivers/mfd/stmpe.c @@ -1219,7 +1219,7 @@ static int stmpe_irq_init(struct stmpe *stmpe, struct= device_node *np) int base =3D 0; int num_irqs =3D stmpe->variant->num_irqs; =20 - stmpe->domain =3D irq_domain_add_simple(np, num_irqs, base, + stmpe->domain =3D irq_domain_add_simple_of_node(np, num_irqs, base, &stmpe_irq_ops, stmpe); if (!stmpe->domain) { dev_err(stmpe->dev, "Failed to create irqdomain\n"); diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c index ef953ee73145..c254910b3172 100644 --- a/drivers/mfd/tc3589x.c +++ b/drivers/mfd/tc3589x.c @@ -234,7 +234,7 @@ static const struct irq_domain_ops tc3589x_irq_ops =3D { =20 static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *n= p) { - tc3589x->domain =3D irq_domain_add_simple( + tc3589x->domain =3D irq_domain_add_simple_of_node( np, TC3589x_NR_INTERNAL_IRQS, 0, &tc3589x_irq_ops, tc3589x); =20 diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c index 029ecc32f078..4ac3c89ca985 100644 --- a/drivers/mfd/tps65217.c +++ b/drivers/mfd/tps65217.c @@ -158,7 +158,7 @@ static int tps65217_irq_init(struct tps65217 *tps, int = irq) tps65217_set_bits(tps, TPS65217_REG_INT, TPS65217_INT_MASK, TPS65217_INT_MASK, TPS65217_PROTECT_NONE); =20 - tps->irq_domain =3D irq_domain_add_linear(tps->dev->of_node, + tps->irq_domain =3D irq_domain_add_linear_of_node(tps->dev->of_node, TPS65217_NUM_IRQ, &tps65217_irq_domain_ops, tps); if (!tps->irq_domain) { dev_err(tps->dev, "Could not create IRQ domain\n"); diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c index 82714899efb2..32f5312bf34e 100644 --- a/drivers/mfd/tps6586x.c +++ b/drivers/mfd/tps6586x.c @@ -363,7 +363,7 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x,= int irq, new_irq_base =3D 0; } =20 - tps6586x->irq_domain =3D irq_domain_add_simple(tps6586x->dev->of_node, + tps6586x->irq_domain =3D irq_domain_add_simple_of_node(tps6586x->dev->of_= node, irq_num, new_irq_base, &tps6586x_domain_ops, tps6586x); if (!tps6586x->irq_domain) { diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 87496c1cb8bc..2754930ddce0 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c @@ -691,7 +691,7 @@ int twl4030_init_irq(struct device *dev, int irq_num) return irq_base; } =20 - irq_domain_add_legacy(node, nr_irqs, irq_base, 0, + irq_domain_add_legacy_of_node(node, nr_irqs, irq_base, 0, &irq_domain_simple_ops, NULL); =20 irq_end =3D irq_base + TWL4030_CORE_NR_IRQS; diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c index 3c03681c124c..5771b3693b7b 100644 --- a/drivers/mfd/twl6030-irq.c +++ b/drivers/mfd/twl6030-irq.c @@ -412,7 +412,7 @@ int twl6030_init_irq(struct device *dev, int irq_num) twl6030_irq->irq_mapping_tbl =3D of_id->data; =20 twl6030_irq->irq_domain =3D - irq_domain_add_linear(node, nr_irqs, + irq_domain_add_linear_of_node(node, nr_irqs, &twl6030_irq_domain_ops, twl6030_irq); if (!twl6030_irq->irq_domain) { dev_err(dev, "Can't add irq_domain\n"); diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c index f1f58e3149ae..f42ebde971ee 100644 --- a/drivers/mfd/wm831x-irq.c +++ b/drivers/mfd/wm831x-irq.c @@ -587,13 +587,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq) } =20 if (irq_base) - domain =3D irq_domain_add_legacy(wm831x->dev->of_node, + domain =3D irq_domain_add_legacy_of_node(wm831x->dev->of_node, ARRAY_SIZE(wm831x_irqs), irq_base, 0, &wm831x_irq_domain_ops, wm831x); else - domain =3D irq_domain_add_linear(wm831x->dev->of_node, + domain =3D irq_domain_add_linear_of_node(wm831x->dev->of_node, ARRAY_SIZE(wm831x_irqs), &wm831x_irq_domain_ops, wm831x); diff --git a/drivers/mfd/wm8994-irq.c b/drivers/mfd/wm8994-irq.c index 651a028bc519..d23c4039f9a3 100644 --- a/drivers/mfd/wm8994-irq.c +++ b/drivers/mfd/wm8994-irq.c @@ -213,7 +213,7 @@ int wm8994_irq_init(struct wm8994 *wm8994) return ret; } =20 - wm8994->edge_irq =3D irq_domain_add_linear(NULL, 1, + wm8994->edge_irq =3D irq_domain_add_linear_of_node(NULL, 1, &wm8994_edge_irq_ops, wm8994); =20 diff --git a/drivers/misc/hi6421v600-irq.c b/drivers/misc/hi6421v600-irq.c index 69ee4f39af2a..ec111aae77e1 100644 --- a/drivers/misc/hi6421v600-irq.c +++ b/drivers/misc/hi6421v600-irq.c @@ -254,7 +254,7 @@ static int hi6421v600_irq_probe(struct platform_device = *pdev) if (!priv->irqs) return -ENOMEM; =20 - priv->domain =3D irq_domain_add_simple(np, PMIC_IRQ_LIST_MAX, 0, + priv->domain =3D irq_domain_add_simple_of_node(np, PMIC_IRQ_LIST_MAX, 0, &hi6421v600_domain_ops, priv); if (!priv->domain) { dev_err(dev, "Failed to create IRQ domain\n"); diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index 89f0796894af..8abf80aeafcf 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -2697,7 +2697,7 @@ static int ksz_irq_common_setup(struct ksz_device *de= v, struct ksz_irq *kirq) kirq->dev =3D dev; kirq->masked =3D ~0; =20 - kirq->domain =3D irq_domain_add_simple(dev->dev->of_node, kirq->nirqs, 0, + kirq->domain =3D irq_domain_add_simple_of_node(dev->dev->of_node, kirq->n= irqs, 0, &ksz_irq_domain_ops, kirq); if (!kirq->domain) return -ENOMEM; diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchi= p/ksz_ptp.c index 22fb9ef4645c..43e108b485a9 100644 --- a/drivers/net/dsa/microchip/ksz_ptp.c +++ b/drivers/net/dsa/microchip/ksz_ptp.c @@ -1136,7 +1136,7 @@ int ksz_ptp_irq_setup(struct dsa_switch *ds, u8 p) =20 init_completion(&port->tstamp_msg_comp); =20 - ptpirq->domain =3D irq_domain_add_linear(dev->dev->of_node, ptpirq->nirqs, + ptpirq->domain =3D irq_domain_add_linear_of_node(dev->dev->of_node, ptpir= q->nirqs, &ksz_ptp_irq_domain_ops, ptpirq); if (!ptpirq->domain) return -ENOMEM; diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index d2d0f091e49e..54e7be0bea60 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2210,11 +2210,11 @@ mt7530_setup_irq(struct mt7530_priv *priv) } =20 if (priv->id =3D=3D ID_MT7988 || priv->id =3D=3D ID_EN7581) - priv->irq_domain =3D irq_domain_add_linear(np, MT7530_NUM_PHYS, + priv->irq_domain =3D irq_domain_add_linear_of_node(np, MT7530_NUM_PHYS, &mt7988_irq_domain_ops, priv); else - priv->irq_domain =3D irq_domain_add_linear(np, MT7530_NUM_PHYS, + priv->irq_domain =3D irq_domain_add_linear_of_node(np, MT7530_NUM_PHYS, &mt7530_irq_domain_ops, priv); =20 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index 68d1e891752b..7cb90789d135 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -297,7 +297,7 @@ static int mv88e6xxx_g1_irq_setup_common(struct mv88e6x= xx_chip *chip) u16 reg, mask; =20 chip->g1_irq.nirqs =3D chip->info->g1_irqs; - chip->g1_irq.domain =3D irq_domain_add_simple( + chip->g1_irq.domain =3D irq_domain_add_simple_of_node( NULL, chip->g1_irq.nirqs, 0, &mv88e6xxx_g1_irq_domain_ops, chip); if (!chip->g1_irq.domain) diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xx= x/global2.c index b2b5f6ba438f..e6bc4c2621b0 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.c +++ b/drivers/net/dsa/mv88e6xxx/global2.c @@ -1154,7 +1154,7 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chi= p) if (err) return err; =20 - chip->g2_irq.domain =3D irq_domain_add_simple( + chip->g2_irq.domain =3D irq_domain_add_simple_of_node( chip->dev->of_node, 16, 0, &mv88e6xxx_g2_irq_domain_ops, chip); if (!chip->g2_irq.domain) return -ENOMEM; diff --git a/drivers/net/dsa/qca/ar9331.c b/drivers/net/dsa/qca/ar9331.c index e9f2c67bc15f..31f34536c425 100644 --- a/drivers/net/dsa/qca/ar9331.c +++ b/drivers/net/dsa/qca/ar9331.c @@ -821,7 +821,7 @@ static int ar9331_sw_irq_init(struct ar9331_sw_priv *pr= iv) return ret; } =20 - priv->irqdomain =3D irq_domain_add_linear(np, 1, &ar9331_sw_irqdomain_ops, + priv->irqdomain =3D irq_domain_add_linear_of_node(np, 1, &ar9331_sw_irqdo= main_ops, priv); if (!priv->irqdomain) { dev_err(dev, "failed to create IRQ domain\n"); diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/= rtl8365mb.c index 7e96355c28bd..996b39e86806 100644 --- a/drivers/net/dsa/realtek/rtl8365mb.c +++ b/drivers/net/dsa/realtek/rtl8365mb.c @@ -1719,7 +1719,7 @@ static int rtl8365mb_irq_setup(struct realtek_priv *p= riv) goto out_put_node; } =20 - priv->irqdomain =3D irq_domain_add_linear(intc, priv->num_ports, + priv->irqdomain =3D irq_domain_add_linear_of_node(intc, priv->num_ports, &rtl8365mb_irqdomain_ops, priv); if (!priv->irqdomain) { dev_err(priv->dev, "failed to add irq domain\n"); diff --git a/drivers/net/dsa/realtek/rtl8366rb.c b/drivers/net/dsa/realtek/= rtl8366rb.c index 23374178a176..1b016ae928eb 100644 --- a/drivers/net/dsa/realtek/rtl8366rb.c +++ b/drivers/net/dsa/realtek/rtl8366rb.c @@ -627,7 +627,7 @@ static int rtl8366rb_setup_cascaded_irq(struct realtek_= priv *priv) dev_err(priv->dev, "unable to request irq: %d\n", ret); goto out_put_node; } - priv->irqdomain =3D irq_domain_add_linear(intc, + priv->irqdomain =3D irq_domain_add_linear_of_node(intc, RTL8366RB_NUM_INTERRUPT, &rtl8366rb_irqdomain_ops, priv); diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c b/drivers/net/e= thernet/wangxun/txgbe/txgbe_irq.c index 0ee73a265545..1eb5e11e7022 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c @@ -178,7 +178,7 @@ int txgbe_setup_misc_irq(struct txgbe *txgbe) int hwirq, err; =20 txgbe->misc.nirqs =3D 1; - txgbe->misc.domain =3D irq_domain_add_simple(NULL, txgbe->misc.nirqs, 0, + txgbe->misc.domain =3D irq_domain_add_simple_of_node(NULL, txgbe->misc.ni= rqs, 0, &txgbe_misc_irq_domain_ops, txgbe); if (!txgbe->misc.domain) return -ENOMEM; diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index a91bf9c7e31d..47627e2d3182 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2475,7 +2475,7 @@ static int lan78xx_setup_irq_domain(struct lan78xx_ne= t *dev) dev->domain_data.irqchip =3D &lan78xx_irqchip; dev->domain_data.irq_handler =3D handle_simple_irq; =20 - irqdomain =3D irq_domain_add_simple(of_node, MAX_INT_EP, 0, + irqdomain =3D irq_domain_add_simple_of_node(of_node, MAX_INT_EP, 0, &chip_domain_ops, &dev->domain_data); if (irqdomain) { /* create mapping for PHY interrupt */ diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controll= er/dwc/pci-dra7xx.c index 5c62e1a3ba52..8e88a76aa841 100644 --- a/drivers/pci/controller/dwc/pci-dra7xx.c +++ b/drivers/pci/controller/dwc/pci-dra7xx.c @@ -359,7 +359,7 @@ static int dra7xx_pcie_init_irq_domain(struct dw_pcie_r= p *pp) =20 irq_set_chained_handler_and_data(pp->irq, dra7xx_pcie_msi_irq_handler, pp); - dra7xx->irq_domain =3D irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, + dra7xx->irq_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, PCI_= NUM_INTX, &intx_domain_ops, pp); of_node_put(pcie_intc_node); if (!dra7xx->irq_domain) { diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/contro= ller/dwc/pci-keystone.c index 63bd5003da45..201f5db24dd9 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -761,7 +761,7 @@ static int ks_pcie_config_intx_irq(struct keystone_pcie= *ks_pcie) ks_pcie); } =20 - intx_irq_domain =3D irq_domain_add_linear(intc_np, PCI_NUM_INTX, + intx_irq_domain =3D irq_domain_add_linear_of_node(intc_np, PCI_NUM_INTX, &ks_pcie_intx_irq_domain_ops, NULL); if (!intx_irq_domain) { dev_err(dev, "Failed to add irq domain for INTX irqs\n"); diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/co= ntroller/dwc/pcie-dw-rockchip.c index ce4b511bff9b..e58333b98336 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -144,7 +144,7 @@ static int rockchip_pcie_init_irq_domain(struct rockchi= p_pcie *rockchip) return -EINVAL; } =20 - rockchip->irq_domain =3D irq_domain_add_linear(intc, PCI_NUM_INTX, + rockchip->irq_domain =3D irq_domain_add_linear_of_node(intc, PCI_NUM_INTX, &intx_domain_ops, rockchip); of_node_put(intc); if (!rockchip->irq_domain) { diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/contr= oller/dwc/pcie-uniphier.c index 5757ca3803c9..14f1ad9e7457 100644 --- a/drivers/pci/controller/dwc/pcie-uniphier.c +++ b/drivers/pci/controller/dwc/pcie-uniphier.c @@ -279,7 +279,7 @@ static int uniphier_pcie_config_intx_irq(struct dw_pcie= _rp *pp) goto out_put_node; } =20 - pcie->intx_irq_domain =3D irq_domain_add_linear(np_intc, PCI_NUM_INTX, + pcie->intx_irq_domain =3D irq_domain_add_linear_of_node(np_intc, PCI_NUM_= INTX, &uniphier_intx_domain_ops, pp); if (!pcie->intx_irq_domain) { dev_err(pci->dev, "Failed to get INTx domain\n"); diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers= /pci/controller/mobiveil/pcie-mobiveil-host.c index 6628eed9d26e..a0e97397919d 100644 --- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c @@ -439,7 +439,7 @@ static int mobiveil_allocate_msi_domains(struct mobivei= l_pcie *pcie) struct mobiveil_msi *msi =3D &pcie->rp.msi; =20 mutex_init(&msi->lock); - msi->dev_domain =3D irq_domain_add_linear(NULL, msi->num_of_vectors, + msi->dev_domain =3D irq_domain_add_linear_of_node(NULL, msi->num_of_vecto= rs, &msi_domain_ops, pcie); if (!msi->dev_domain) { dev_err(dev, "failed to create IRQ domain\n"); @@ -465,7 +465,7 @@ static int mobiveil_pcie_init_irq_domain(struct mobivei= l_pcie *pcie) struct mobiveil_root_port *rp =3D &pcie->rp; =20 /* setup INTx */ - rp->intx_domain =3D irq_domain_add_linear(node, PCI_NUM_INTX, + rp->intx_domain =3D irq_domain_add_linear_of_node(node, PCI_NUM_INTX, &intx_domain_ops, pcie); =20 if (!rp->intx_domain) { diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller= /pci-aardvark.c index a29796cce420..6045b472973d 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -1457,7 +1457,7 @@ static int advk_pcie_init_msi_irq_domain(struct advk_= pcie *pcie) mutex_init(&pcie->msi_used_lock); =20 pcie->msi_inner_domain =3D - irq_domain_add_linear(NULL, MSI_IRQ_NUM, + irq_domain_add_linear_of_node(NULL, MSI_IRQ_NUM, &advk_msi_domain_ops, pcie); if (!pcie->msi_inner_domain) return -ENOMEM; @@ -1509,7 +1509,7 @@ static int advk_pcie_init_irq_domain(struct advk_pcie= *pcie) irq_chip->irq_unmask =3D advk_pcie_irq_unmask; =20 pcie->irq_domain =3D - irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, + irq_domain_add_linear_of_node(pcie_intc_node, PCI_NUM_INTX, &advk_pcie_irq_domain_ops, pcie); if (!pcie->irq_domain) { dev_err(dev, "Failed to get a INTx IRQ domain\n"); @@ -1549,7 +1549,7 @@ static const struct irq_domain_ops advk_pcie_rp_irq_d= omain_ops =3D { =20 static int advk_pcie_init_rp_irq_domain(struct advk_pcie *pcie) { - pcie->rp_irq_domain =3D irq_domain_add_linear(NULL, 1, + pcie->rp_irq_domain =3D irq_domain_add_linear_of_node(NULL, 1, &advk_pcie_rp_irq_domain_ops, pcie); if (!pcie->rp_irq_domain) { diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller= /pci-ftpci100.c index ffdeed25e961..ddbed351e7ef 100644 --- a/drivers/pci/controller/pci-ftpci100.c +++ b/drivers/pci/controller/pci-ftpci100.c @@ -345,7 +345,7 @@ static int faraday_pci_setup_cascaded_irq(struct farada= y_pci *p) return irq ?: -EINVAL; } =20 - p->irqdomain =3D irq_domain_add_linear(intc, PCI_NUM_INTX, + p->irqdomain =3D irq_domain_add_linear_of_node(intc, PCI_NUM_INTX, &faraday_pci_irqdomain_ops, p); of_node_put(intc); if (!p->irqdomain) { diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pc= i-mvebu.c index 46d3afe1d308..7b55743eb3d5 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -1078,7 +1078,7 @@ static int mvebu_pcie_init_irq_domain(struct mvebu_pc= ie_port *port) return -ENODEV; } =20 - port->intx_irq_domain =3D irq_domain_add_linear(pcie_intc_node, PCI_NUM_I= NTX, + port->intx_irq_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, P= CI_NUM_INTX, &mvebu_pcie_intx_irq_domain_ops, port); of_node_put(pcie_intc_node); diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controlle= r/pci-xgene-msi.c index 2c825105ad82..9ccc2925b97e 100644 --- a/drivers/pci/controller/pci-xgene-msi.c +++ b/drivers/pci/controller/pci-xgene-msi.c @@ -242,7 +242,7 @@ static const struct irq_domain_ops msi_domain_ops =3D { =20 static int xgene_allocate_domains(struct xgene_msi *msi) { - msi->inner_domain =3D irq_domain_add_linear(NULL, NR_MSI_VEC, + msi->inner_domain =3D irq_domain_add_linear_of_node(NULL, NR_MSI_VEC, &msi_domain_ops, msi); if (!msi->inner_domain) return -ENOMEM; diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/control= ler/pcie-altera-msi.c index 5fb3a2e0017e..d445c9da9374 100644 --- a/drivers/pci/controller/pcie-altera-msi.c +++ b/drivers/pci/controller/pcie-altera-msi.c @@ -166,7 +166,7 @@ static int altera_allocate_domains(struct altera_msi *m= si) { struct fwnode_handle *fwnode =3D of_fwnode_handle(msi->pdev->dev.of_node); =20 - msi->inner_domain =3D irq_domain_add_linear(NULL, msi->num_of_vectors, + msi->inner_domain =3D irq_domain_add_linear_of_node(NULL, msi->num_of_vec= tors, &msi_domain_ops, msi); if (!msi->inner_domain) { dev_err(&msi->pdev->dev, "failed to create IRQ domain\n"); diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/= pcie-altera.c index eb55a7f8573a..d68e14be43c6 100644 --- a/drivers/pci/controller/pcie-altera.c +++ b/drivers/pci/controller/pcie-altera.c @@ -669,7 +669,7 @@ static int altera_pcie_init_irq_domain(struct altera_pc= ie *pcie) struct device_node *node =3D dev->of_node; =20 /* Setup INTx */ - pcie->irq_domain =3D irq_domain_add_linear(node, PCI_NUM_INTX, + pcie->irq_domain =3D irq_domain_add_linear_of_node(node, PCI_NUM_INTX, &intx_domain_ops, pcie); if (!pcie->irq_domain) { dev_err(dev, "Failed to get a INTx IRQ domain\n"); diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller= /pcie-brcmstb.c index 6bfe86ace0cc..350671d4db47 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -575,7 +575,7 @@ static int brcm_allocate_domains(struct brcm_msi *msi) struct fwnode_handle *fwnode =3D of_fwnode_handle(msi->np); struct device *dev =3D msi->dev; =20 - msi->inner_domain =3D irq_domain_add_linear(NULL, msi->nr, &msi_domain_op= s, msi); + msi->inner_domain =3D irq_domain_add_linear_of_node(NULL, msi->nr, &msi_d= omain_ops, msi); if (!msi->inner_domain) { dev_err(dev, "failed to create IRQ domain\n"); return -ENOMEM; diff --git a/drivers/pci/controller/pcie-iproc-msi.c b/drivers/pci/controll= er/pcie-iproc-msi.c index 804b3a5787c5..175efd4af600 100644 --- a/drivers/pci/controller/pcie-iproc-msi.c +++ b/drivers/pci/controller/pcie-iproc-msi.c @@ -446,7 +446,7 @@ static void iproc_msi_disable(struct iproc_msi *msi) static int iproc_msi_alloc_domains(struct device_node *node, struct iproc_msi *msi) { - msi->inner_domain =3D irq_domain_add_linear(NULL, msi->nr_msi_vecs, + msi->inner_domain =3D irq_domain_add_linear_of_node(NULL, msi->nr_msi_vec= s, &msi_domain_ops, msi); if (!msi->inner_domain) return -ENOMEM; diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/cont= roller/pcie-mediatek-gen3.c index 0aa42df33090..af9ff824203f 100644 --- a/drivers/pci/controller/pcie-mediatek-gen3.c +++ b/drivers/pci/controller/pcie-mediatek-gen3.c @@ -745,7 +745,7 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pc= ie *pcie) return -ENODEV; } =20 - pcie->intx_domain =3D irq_domain_add_linear(intc_node, PCI_NUM_INTX, + pcie->intx_domain =3D irq_domain_add_linear_of_node(intc_node, PCI_NUM_IN= TX, &intx_domain_ops, pcie); if (!pcie->intx_domain) { dev_err(dev, "failed to create INTx IRQ domain\n"); @@ -756,7 +756,7 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pc= ie *pcie) /* Setup MSI */ mutex_init(&pcie->lock); =20 - pcie->msi_bottom_domain =3D irq_domain_add_linear(node, PCIE_MSI_IRQS_NUM, + pcie->msi_bottom_domain =3D irq_domain_add_linear_of_node(node, PCIE_MSI_= IRQS_NUM, &mtk_msi_bottom_domain_ops, pcie); if (!pcie->msi_bottom_domain) { dev_err(dev, "failed to create MSI bottom domain\n"); diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controlle= r/pcie-mediatek.c index e9e6072577ce..cc4cd4c5e63c 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -569,7 +569,7 @@ static int mtk_pcie_init_irq_domain(struct mtk_pcie_por= t *port, return -ENODEV; } =20 - port->irq_domain =3D irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, + port->irq_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, PCI_NU= M_INTX, &intx_domain_ops, port); of_node_put(pcie_intc_node); if (!port->irq_domain) { diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/cont= roller/pcie-rockchip-host.c index 5adac6adc046..91fdcb31c4e4 100644 --- a/drivers/pci/controller/pcie-rockchip-host.c +++ b/drivers/pci/controller/pcie-rockchip-host.c @@ -693,7 +693,7 @@ static int rockchip_pcie_init_irq_domain(struct rockchi= p_pcie *rockchip) return -EINVAL; } =20 - rockchip->irq_domain =3D irq_domain_add_linear(intc, PCI_NUM_INTX, + rockchip->irq_domain =3D irq_domain_add_linear_of_node(intc, PCI_NUM_INTX, &intx_domain_ops, rockchip); of_node_put(intc); if (!rockchip->irq_domain) { diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c b/drivers/pci/control= ler/pcie-xilinx-cpm.c index 81e8bfae53d0..cbd105aa5d9f 100644 --- a/drivers/pci/controller/pcie-xilinx-cpm.c +++ b/drivers/pci/controller/pcie-xilinx-cpm.c @@ -394,7 +394,7 @@ static int xilinx_cpm_pcie_init_irq_domain(struct xilin= x_cpm_pcie *port) return -EINVAL; } =20 - port->cpm_domain =3D irq_domain_add_linear(pcie_intc_node, 32, + port->cpm_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, 32, &event_domain_ops, port); if (!port->cpm_domain) @@ -402,7 +402,7 @@ static int xilinx_cpm_pcie_init_irq_domain(struct xilin= x_cpm_pcie *port) =20 irq_domain_update_bus_token(port->cpm_domain, DOMAIN_BUS_NEXUS); =20 - port->intx_domain =3D irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, + port->intx_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, PCI_N= UM_INTX, &intx_domain_ops, port); if (!port->intx_domain) diff --git a/drivers/pci/controller/pcie-xilinx-dma-pl.c b/drivers/pci/cont= roller/pcie-xilinx-dma-pl.c index 71cf13ae51c7..3639b8934cbe 100644 --- a/drivers/pci/controller/pcie-xilinx-dma-pl.c +++ b/drivers/pci/controller/pcie-xilinx-dma-pl.c @@ -472,7 +472,7 @@ static int xilinx_pl_dma_pcie_init_msi_irq_domain(struc= t pl_dma_pcie *port) int size =3D BITS_TO_LONGS(XILINX_NUM_MSI_IRQS) * sizeof(long); struct fwnode_handle *fwnode =3D of_fwnode_handle(port->dev->of_node); =20 - msi->dev_domain =3D irq_domain_add_linear(NULL, XILINX_NUM_MSI_IRQS, + msi->dev_domain =3D irq_domain_add_linear_of_node(NULL, XILINX_NUM_MSI_IR= QS, &dev_msi_domain_ops, port); if (!msi->dev_domain) goto out; @@ -585,14 +585,14 @@ static int xilinx_pl_dma_pcie_init_irq_domain(struct = pl_dma_pcie *port) return -EINVAL; } =20 - port->pldma_domain =3D irq_domain_add_linear(pcie_intc_node, 32, + port->pldma_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, 32, &event_domain_ops, port); if (!port->pldma_domain) return -ENOMEM; =20 irq_domain_update_bus_token(port->pldma_domain, DOMAIN_BUS_NEXUS); =20 - port->intx_domain =3D irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, + port->intx_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, PCI_N= UM_INTX, &intx_domain_ops, port); if (!port->intx_domain) { dev_err(dev, "Failed to get a INTx IRQ domain\n"); diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/control= ler/pcie-xilinx-nwl.c index 9cf8a96f7bc4..4716f1a12823 100644 --- a/drivers/pci/controller/pcie-xilinx-nwl.c +++ b/drivers/pci/controller/pcie-xilinx-nwl.c @@ -498,7 +498,7 @@ static int nwl_pcie_init_msi_irq_domain(struct nwl_pcie= *pcie) struct fwnode_handle *fwnode =3D of_fwnode_handle(dev->of_node); struct nwl_msi *msi =3D &pcie->msi; =20 - msi->dev_domain =3D irq_domain_add_linear(NULL, INT_PCI_MSI_NR, + msi->dev_domain =3D irq_domain_add_linear_of_node(NULL, INT_PCI_MSI_NR, &dev_msi_domain_ops, pcie); if (!msi->dev_domain) { dev_err(dev, "failed to create dev IRQ domain\n"); @@ -582,7 +582,7 @@ static int nwl_pcie_init_irq_domain(struct nwl_pcie *pc= ie) return -EINVAL; } =20 - pcie->intx_irq_domain =3D irq_domain_add_linear(intc_node, + pcie->intx_irq_domain =3D irq_domain_add_linear_of_node(intc_node, PCI_NUM_INTX, &intx_domain_ops, pcie); diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/= pcie-xilinx.c index 0b534f73a942..6c0268e92e41 100644 --- a/drivers/pci/controller/pcie-xilinx.c +++ b/drivers/pci/controller/pcie-xilinx.c @@ -461,7 +461,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pc= ie *pcie) return -ENODEV; } =20 - pcie->leg_domain =3D irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, + pcie->leg_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, PCI_NU= M_INTX, &intx_domain_ops, pcie); of_node_put(pcie_intc_node); diff --git a/drivers/pci/controller/plda/pcie-plda-host.c b/drivers/pci/con= troller/plda/pcie-plda-host.c index 91ead8ebc2ae..4dd79e20ce04 100644 --- a/drivers/pci/controller/plda/pcie-plda-host.c +++ b/drivers/pci/controller/plda/pcie-plda-host.c @@ -152,7 +152,7 @@ static int plda_allocate_msi_domains(struct plda_pcie_r= p *port) =20 mutex_init(&port->msi.lock); =20 - msi->dev_domain =3D irq_domain_add_linear(NULL, msi->num_vectors, + msi->dev_domain =3D irq_domain_add_linear_of_node(NULL, msi->num_vectors, &msi_domain_ops, port); if (!msi->dev_domain) { dev_err(dev, "failed to create IRQ domain\n"); @@ -390,7 +390,7 @@ static int plda_pcie_init_irq_domains(struct plda_pcie_= rp *port) return -EINVAL; } =20 - port->event_domain =3D irq_domain_add_linear(pcie_intc_node, + port->event_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, port->num_events, &plda_event_domain_ops, port); @@ -402,7 +402,7 @@ static int plda_pcie_init_irq_domains(struct plda_pcie_= rp *port) =20 irq_domain_update_bus_token(port->event_domain, DOMAIN_BUS_NEXUS); =20 - port->intx_domain =3D irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, + port->intx_domain =3D irq_domain_add_linear_of_node(pcie_intc_node, PCI_N= UM_INTX, &intx_domain_ops, port); if (!port->intx_domain) { dev_err(dev, "failed to get an INTx IRQ domain\n"); diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek= /mtk-eint.c index 27f0a54e12bf..2f546e88e1d6 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.c +++ b/drivers/pinctrl/mediatek/mtk-eint.c @@ -508,7 +508,7 @@ int mtk_eint_do_init(struct mtk_eint *eint) if (!eint->dual_edge) return -ENOMEM; =20 - eint->domain =3D irq_domain_add_linear(eint->dev->of_node, + eint->domain =3D irq_domain_add_linear_of_node(eint->dev->of_node, eint->hw->ap_num, &irq_domain_simple_ops, NULL); if (!eint->domain) diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-= at91-pio4.c index 8b01d312305a..40f172d3bd29 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -1206,7 +1206,7 @@ static int atmel_pinctrl_probe(struct platform_device= *pdev) dev_dbg(dev, "bank %i: irq=3D%d\n", i, ret); } =20 - atmel_pioctrl->irq_domain =3D irq_domain_add_linear(dev->of_node, + atmel_pioctrl->irq_domain =3D irq_domain_add_linear_of_node(dev->of_node, atmel_pioctrl->gpio_chip->ngpio, &irq_domain_simple_ops, NULL); if (!atmel_pioctrl->irq_domain) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-sin= gle.c index 5be14dc979e2..7ca1a80dd65a 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1611,13 +1611,13 @@ static int pcs_irq_init_chained_handler(struct pcs_= device *pcs, =20 /* * We can use the register offset as the hardirq - * number as irq_domain_add_simple maps them lazily. + * number as irq_domain_add_simple_of_node maps them lazily. * This way we can easily support more than one * interrupt per function if needed. */ num_irqs =3D pcs->size; =20 - pcs->domain =3D irq_domain_add_simple(np, num_irqs, 0, + pcs->domain =3D irq_domain_add_simple_of_node(np, num_irqs, 0, &pcs_irqdomain_ops, pcs_soc); if (!pcs->domain) { diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/= pinctrl-sunxi.c index bde67ee31417..6de124300e46 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -1626,7 +1626,7 @@ int sunxi_pinctrl_init_with_variant(struct platform_d= evice *pdev, } } =20 - pctl->domain =3D irq_domain_add_linear(node, + pctl->domain =3D irq_domain_add_linear_of_node(node, pctl->desc->irq_banks * IRQ_PER_BANK, &sunxi_pinctrl_irq_domain_ops, pctl); diff --git a/drivers/platform/x86/asus-tf103c-dock.c b/drivers/platform/x86= /asus-tf103c-dock.c index ca4670d0dc67..e360d0ab6081 100644 --- a/drivers/platform/x86/asus-tf103c-dock.c +++ b/drivers/platform/x86/asus-tf103c-dock.c @@ -856,7 +856,7 @@ static int tf103c_dock_probe(struct i2c_client *client) /* 5. Setup irqchip for touchpad IRQ pass-through */ dock->tp_irqchip.name =3D KBUILD_MODNAME; =20 - dock->tp_irq_domain =3D irq_domain_add_linear(NULL, 1, &irq_domain_simple= _ops, NULL); + dock->tp_irq_domain =3D irq_domain_add_linear_of_node(NULL, 1, &irq_domai= n_simple_ops, NULL); if (!dock->tp_irq_domain) return -ENOMEM; =20 diff --git a/drivers/sh/intc/irqdomain.c b/drivers/sh/intc/irqdomain.c index 3968f1c3c5c3..23dc3b68d1e0 100644 --- a/drivers/sh/intc/irqdomain.c +++ b/drivers/sh/intc/irqdomain.c @@ -59,10 +59,10 @@ void __init intc_irq_domain_init(struct intc_desc_int *= d, * tree penalty for linear cases with non-zero hwirq bases. */ if (irq_base =3D=3D 0 && irq_end =3D=3D (irq_base + hw->nr_vectors - 1)) - d->domain =3D irq_domain_add_linear(NULL, hw->nr_vectors, + d->domain =3D irq_domain_add_linear_of_node(NULL, hw->nr_vectors, &intc_evt_ops, NULL); else - d->domain =3D irq_domain_add_tree(NULL, &intc_evt_ops, NULL); + d->domain =3D irq_domain_add_tree_of_node(NULL, &intc_evt_ops, NULL); =20 BUG_ON(!d->domain); } diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c index 6202dbcd20a8..bafbba8709f0 100644 --- a/drivers/soc/dove/pmu.c +++ b/drivers/soc/dove/pmu.c @@ -274,7 +274,7 @@ static int __init dove_init_pmu_irq(struct pmu_data *pm= u, int irq) writel(0, pmu->pmc_base + PMC_IRQ_MASK); writel(0, pmu->pmc_base + PMC_IRQ_CAUSE); =20 - domain =3D irq_domain_add_linear(pmu->of_node, NR_PMU_IRQS, + domain =3D irq_domain_add_linear_of_node(pmu->of_node, NR_PMU_IRQS, &irq_generic_chip_ops, NULL); if (!domain) { pr_err("%s: unable to add irq domain\n", name); diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c index bbae3d39c7be..1da110eeb0c7 100644 --- a/drivers/soc/fsl/qe/qe_ic.c +++ b/drivers/soc/fsl/qe/qe_ic.c @@ -446,7 +446,7 @@ static int qe_ic_init(struct platform_device *pdev) high_handler =3D NULL; } =20 - qe_ic->irqhost =3D irq_domain_add_linear(node, NR_QE_IC_INTS, + qe_ic->irqhost =3D irq_domain_add_linear_of_node(node, NR_QE_IC_INTS, &qe_ic_host_ops, qe_ic); if (qe_ic->irqhost =3D=3D NULL) { dev_err(dev, "failed to add irq domain\n"); diff --git a/drivers/soc/qcom/smp2p.c b/drivers/soc/qcom/smp2p.c index 4783ab1adb8d..46385c192997 100644 --- a/drivers/soc/qcom/smp2p.c +++ b/drivers/soc/qcom/smp2p.c @@ -399,7 +399,7 @@ static int qcom_smp2p_inbound_entry(struct qcom_smp2p *= smp2p, struct smp2p_entry *entry, struct device_node *node) { - entry->domain =3D irq_domain_add_linear(node, 32, &smp2p_irq_ops, entry); + entry->domain =3D irq_domain_add_linear_of_node(node, 32, &smp2p_irq_ops,= entry); if (!entry->domain) { dev_err(smp2p->dev, "failed to add irq_domain\n"); return -ENOMEM; diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c index e803ea342c97..a7587b8f929c 100644 --- a/drivers/soc/qcom/smsm.c +++ b/drivers/soc/qcom/smsm.c @@ -456,7 +456,7 @@ static int smsm_inbound_entry(struct qcom_smsm *smsm, return ret; } =20 - entry->domain =3D irq_domain_add_linear(node, 32, &smsm_irq_ops, entry); + entry->domain =3D irq_domain_add_linear_of_node(node, 32, &smsm_irq_ops, = entry); if (!entry->domain) { dev_err(smsm->dev, "failed to add irq_domain\n"); return -ENOMEM; diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index a08c377933c5..64da24d8bdd3 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -2499,7 +2499,7 @@ static int tegra_pmc_irq_init(struct tegra_pmc *pmc) pmc->irq.irq_set_type =3D pmc->soc->irq_set_type; pmc->irq.irq_set_wake =3D pmc->soc->irq_set_wake; =20 - pmc->domain =3D irq_domain_add_hierarchy(parent, 0, 96, pmc->dev->of_node, + pmc->domain =3D irq_domain_add_hierarchy_of_node(parent, 0, 96, pmc->dev-= >of_node, &tegra_pmc_irq_domain_ops, pmc); if (!pmc->domain) { dev_err(pmc->dev, "failed to allocate domain\n"); diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 73f2f19737f8..31bec5645777 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -1737,7 +1737,7 @@ static int spmi_pmic_arb_bus_init(struct platform_dev= ice *pdev, =20 dev_dbg(&pdev->dev, "adding irq domain for bus %d\n", bus_index); =20 - bus->domain =3D irq_domain_add_tree(node, &pmic_arb_irq_domain_ops, bus); + bus->domain =3D irq_domain_add_tree_of_node(node, &pmic_arb_irq_domain_op= s, bus); if (!bus->domain) { dev_err(&pdev->dev, "unable to create irq_domain\n"); return -ENOMEM; diff --git a/drivers/ssb/driver_gpio.c b/drivers/ssb/driver_gpio.c index 897cb8db5084..9c0c789bb936 100644 --- a/drivers/ssb/driver_gpio.c +++ b/drivers/ssb/driver_gpio.c @@ -148,7 +148,7 @@ static int ssb_gpio_irq_chipco_domain_init(struct ssb_b= us *bus) if (bus->bustype !=3D SSB_BUSTYPE_SSB) return 0; =20 - bus->irq_domain =3D irq_domain_add_linear(NULL, chip->ngpio, + bus->irq_domain =3D irq_domain_add_linear_of_node(NULL, chip->ngpio, &irq_domain_simple_ops, chipco); if (!bus->irq_domain) { err =3D -ENODEV; @@ -347,7 +347,7 @@ static int ssb_gpio_irq_extif_domain_init(struct ssb_bu= s *bus) if (bus->bustype !=3D SSB_BUSTYPE_SSB) return 0; =20 - bus->irq_domain =3D irq_domain_add_linear(NULL, chip->ngpio, + bus->irq_domain =3D irq_domain_add_linear_of_node(NULL, chip->ngpio, &irq_domain_simple_ops, extif); if (!bus->irq_domain) { err =3D -ENODEV; diff --git a/drivers/thermal/qcom/lmh.c b/drivers/thermal/qcom/lmh.c index d2d49264cf83..2b6cdffbab28 100644 --- a/drivers/thermal/qcom/lmh.c +++ b/drivers/thermal/qcom/lmh.c @@ -209,7 +209,7 @@ static int lmh_probe(struct platform_device *pdev) } =20 lmh_data->irq =3D platform_get_irq(pdev, 0); - lmh_data->domain =3D irq_domain_add_linear(np, 1, &lmh_irq_ops, lmh_data); + lmh_data->domain =3D irq_domain_add_linear_of_node(np, 1, &lmh_irq_ops, l= mh_data); if (!lmh_data->domain) { dev_err(dev, "Error adding irq_domain\n"); return -EINVAL; diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/socth= erm.c index 2c5ddf0db40c..636d92b28692 100644 --- a/drivers/thermal/tegra/soctherm.c +++ b/drivers/thermal/tegra/soctherm.c @@ -1234,7 +1234,7 @@ static int soctherm_oc_int_init(struct device_node *n= p, int num_irqs) soc_irq_cdata.irq_chip.irq_set_type =3D soctherm_oc_irq_set_type; soc_irq_cdata.irq_chip.irq_set_wake =3D NULL; =20 - soc_irq_cdata.domain =3D irq_domain_add_linear(np, num_irqs, + soc_irq_cdata.domain =3D irq_domain_add_linear_of_node(np, num_irqs, &soctherm_oc_domain_ops, &soc_irq_cdata); =20 diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 2dd7cb9cc270..7d2bdb265de9 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -286,7 +286,7 @@ struct gpio_irq_chip { /** * @first: * - * Required for static IRQ allocation. If set, irq_domain_add_simple() + * Required for static IRQ allocation. If set, irq_domain_add_simple_of_n= ode() * will allocate and map all IRQs during initialization. */ unsigned int first; diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index a7f41a6163c5..ebc6f622e96b 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -346,7 +346,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwno= de_handle *fwnode, void *host_data); =20 /** - * irq_domain_add_legacy() - Allocate and register a legacy revmap irq_dom= ain. + * irq_domain_add_legacy_of_node() - Allocate and register a legacy revmap= irq_domain. * @of_node: pointer to interrupt controller's device tree node. * @size: total number of irqs in legacy mapping * @first_irq: first number of irq block assigned to the domain @@ -360,7 +360,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwno= de_handle *fwnode, * for all legacy interrupts except 0 (which is always the invalid irq for * a legacy controller). */ -static inline struct irq_domain *irq_domain_add_legacy(struct device_node = *of_node, +static inline struct irq_domain *irq_domain_add_legacy_of_node(struct devi= ce_node *of_node, unsigned int size, unsigned int first_irq, irq_hw_number_t first_hwirq, @@ -417,7 +417,7 @@ static inline struct irq_domain *irq_find_host(struct d= evice_node *node) return d; } =20 -static inline struct irq_domain *irq_domain_add_simple(struct device_node = *of_node, +static inline struct irq_domain *irq_domain_add_simple_of_node(struct devi= ce_node *of_node, unsigned int size, unsigned int first_irq, const struct irq_domain_ops *ops, @@ -427,13 +427,13 @@ static inline struct irq_domain *irq_domain_add_simpl= e(struct device_node *of_no } =20 /** - * irq_domain_add_linear() - Allocate and register a linear revmap irq_dom= ain. + * irq_domain_add_linear_of_node() - Allocate and register a linear revmap= irq_domain. * @of_node: pointer to interrupt controller's device tree node. * @size: Number of interrupts in the domain. * @ops: map/unmap domain callbacks * @host_data: Controller private data pointer */ -static inline struct irq_domain *irq_domain_add_linear(struct device_node = *of_node, +static inline struct irq_domain *irq_domain_add_linear_of_node(struct devi= ce_node *of_node, unsigned int size, const struct irq_domain_ops *ops, void *host_data) @@ -451,7 +451,7 @@ static inline struct irq_domain *irq_domain_add_linear(= struct device_node *of_no } =20 #ifdef CONFIG_IRQ_DOMAIN_NOMAP -static inline struct irq_domain *irq_domain_add_nomap(struct device_node *= of_node, +static inline struct irq_domain *irq_domain_add_nomap_of_node(struct devic= e_node *of_node, unsigned int max_irq, const struct irq_domain_ops *ops, void *host_data) @@ -471,7 +471,7 @@ static inline struct irq_domain *irq_domain_add_nomap(s= truct device_node *of_nod unsigned int irq_create_direct_mapping(struct irq_domain *domain); #endif =20 -static inline struct irq_domain *irq_domain_add_tree(struct device_node *o= f_node, +static inline struct irq_domain *irq_domain_add_tree_of_node(struct device= _node *of_node, const struct irq_domain_ops *ops, void *host_data) { @@ -643,7 +643,7 @@ static inline struct irq_domain *irq_domain_create_hier= archy(struct irq_domain * return IS_ERR(d) ? NULL : d; } =20 -static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domai= n *parent, +static inline struct irq_domain *irq_domain_add_hierarchy_of_node(struct i= rq_domain *parent, unsigned int flags, unsigned int size, struct device_node *node, diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c index c9d5e67bf66e..8afa20a3bdfb 100644 --- a/sound/soc/codecs/wcd937x.c +++ b/sound/soc/codecs/wcd937x.c @@ -2472,7 +2472,7 @@ static const struct irq_domain_ops wcd_domain_ops =3D= { =20 static int wcd937x_irq_init(struct wcd937x_priv *wcd, struct device *dev) { - wcd->virq =3D irq_domain_add_linear(NULL, 1, &wcd_domain_ops, NULL); + wcd->virq =3D irq_domain_add_linear_of_node(NULL, 1, &wcd_domain_ops, NUL= L); if (!(wcd->virq)) { dev_err(dev, "%s: Failed to add IRQ domain\n", __func__); return -EINVAL; diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index f2a4f3262bdb..81fff69b3152 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -3030,7 +3030,7 @@ static const struct irq_domain_ops wcd_domain_ops =3D= { static int wcd938x_irq_init(struct wcd938x_priv *wcd, struct device *dev) { =20 - wcd->virq =3D irq_domain_add_linear(NULL, 1, &wcd_domain_ops, NULL); + wcd->virq =3D irq_domain_add_linear_of_node(NULL, 1, &wcd_domain_ops, NUL= L); if (!(wcd->virq)) { dev_err(dev, "%s: Failed to add IRQ domain\n", __func__); return -EINVAL; diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 4a417a92514d..0c2190909839 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -2975,7 +2975,7 @@ static const struct irq_domain_ops wcd_domain_ops =3D= { =20 static int wcd939x_irq_init(struct wcd939x_priv *wcd, struct device *dev) { - wcd->virq =3D irq_domain_add_linear(NULL, 1, &wcd_domain_ops, NULL); + wcd->virq =3D irq_domain_add_linear_of_node(NULL, 1, &wcd_domain_ops, NUL= L); if (!(wcd->virq)) { dev_err(dev, "%s: Failed to add IRQ domain\n", __func__); return -EINVAL; --=20 2.48.0