irqdomain: Cleanups and Documentation
Subsystems (144)
v2 cover irqdomain: Cleanups and Documentation
Hi,
tl;dr if patches are agreed upon, I ask subsys maintainers to take the respective ones via their trees (as they are split per subsys), so that the IRQ tree can take only the rest. That would minimize churn/conflicts during merges.
===
While I was reading through the irqdomain code and headers, I found some naming and documentation hard to follow or incomplete. Especially the naming of _add/_create/_instantiate functions.
I tried to come up with a better state with this patchset:
* only irq _domain_ (not host),
* only irq_domain_create*() functions, all taking fwnode uniformly,
Finally, all the irqdomain stuff is now plugged (and generated) into Documentation. So that everyone can walk through it at
https://www.kernel.org/doc/ (once applied, of course).
Changelog
---------
[v2]
- 'extern' removal patch dropped (already merged into tip),
- some new patches added,
- only _create*() functions preserved, all _add*() are removed, as per <87wme3m4a9.ffs@tglx>.
Jiri Slaby (SUSE) (57):
irqdomain: um: use irq_domain_create_linear() helper
irqdomain: Rename irq_set_default_host() to irq_set_default_domain()
irqdomain: Rename irq_get_default_host() to irq_get_default_domain() irqdomain.h: Stop using 'host' for domain
irqdomain: cdx: Switch to of_fwnode_handle()
irqdomain: irqchip: Switch to of_fwnode_handle()
irqdomain: pci: Switch to of_fwnode_handle()
irqdomain: ppc: Switch to of_fwnode_handle()
irqdomain: remoteproc: Switch to of_fwnode_handle()
irqdomain: x86: Switch to of_fwnode_handle()
irqdomain: Drop of_node_to_fwnode()
irqdomain: Make irq_domain_create_hierarchy() an inline
irqdomain: arc: Switch to irq_domain_create_linear()
irqdomain: arm: Switch to irq_domain_create_*()
irqdomain: bus: Switch to irq_domain_create_simple()
irqdomain: edac: Switch to irq_domain_create_linear()
irqdomain: gpio: Switch to irq_domain_create_*()
irqdomain: gpu: Switch to irq_domain_create_linear()
irqdomain: i2c: Switch to irq_domain_create_linear()
irqdomain: iio: Switch to irq_domain_create_simple()
irqdomain: irqchip: Switch to irq_domain_create_*()
irqdomain: mailbox: Switch to irq_domain_create_tree()
irqdomain: memory: Switch to irq_domain_create_linear()
irqdomain: mfd: Switch to irq_domain_create_*()
irqdomain: mips: Switch to irq_domain_create_*()
irqdomain: misc: Switch to irq_domain_create_simple()
irqdomain: net: Switch to irq_domain_create_*()
irqdomain: nios2: Switch to irq_domain_create_linear()
irqdomain: pci: Switch to irq_domain_create_linear()
irqdomain: pinctrl: Switch to irq_domain_create_*()
irqdomain: platform/x86: Switch to irq_domain_create_linear()
irqdomain: ppc: Switch to irq_domain_create_*()
irqdomain: sh: Switch to irq_domain_create_*()
irqdomain: soc: Switch to irq_domain_create_*()
irqdomain: sound: Switch to irq_domain_create_linear()
irqdomain: spmi: Switch to irq_domain_create_tree()
irqdomain: ssb: Switch to irq_domain_create_linear()
irqdomain: thermal: Switch to irq_domain_create_linear()
irqdomain: ppc: Switch irq_domain_add_nomap() to use fwnode
irqdomain: Drop irq_domain_add_*() functions
irqdomain: ppc: Switch to irq_find_mapping()
irqdomain: sh: Switch to irq_find_mapping()
irqdomain: gpio: Switch to irq_find_mapping()
irqdomain: gpu: Switch to irq_find_mapping()
irqdomain: i2c: Switch to irq_find_mapping()
irqdomain: irqchip: Switch to irq_find_mapping()
irqdomain: pinctrl: Switch to irq_find_mapping()
irqdomain: soc: Switch to irq_find_mapping()
irqdomain: Drop irq_linear_revmap()
irqdomain: Use irq_domain_instantiate() retvals as initializers
irqdomain: Make struct irq_domain_info variables const irqdomain.h: Improve kernel-docs of functions
docs: irq/concepts: Add commas and reflow
docs: irq/concepts: Minor improvements
docs: irq-domain.rst: Simple improvements
docs: irqdomain: Update
irqdomain.c: Fix kernel-doc and add it to Documentation
Documentation/core-api/genericirq.rst | 2 - Documentation/core-api/irq/concepts.rst | 27 +-- Documentation/core-api/irq/irq-domain.rst | 202 +++++++++-------- .../zh_CN/core-api/irq/irq-domain.rst | 8 +- arch/arc/kernel/intc-arcv2.c | 4 +- arch/arc/kernel/intc-compact.c | 7 +- arch/arc/kernel/mcip.c | 3 +- arch/arm/common/sa1111.c | 6 +- arch/arm/mach-exynos/suspend.c | 5 +- arch/arm/mach-imx/avic.c | 4 +- arch/arm/mach-imx/gpc.c | 5 +- arch/arm/mach-imx/tzic.c | 4 +- arch/arm/mach-omap1/irq.c | 3 +- arch/arm/mach-omap2/omap-wakeupgen.c | 5 +- arch/arm/mach-pxa/irq.c | 7 +- arch/arm/plat-orion/gpio.c | 12 +- arch/mips/ath25/ar2315.c | 4 +- arch/mips/ath25/ar5312.c | 4 +- arch/mips/cavium-octeon/octeon-irq.c | 31 +-- arch/mips/lantiq/irq.c | 2 +- arch/mips/pci/pci-ar2315.c | 4 +- arch/mips/pci/pci-rt3883.c | 7 +- arch/mips/pci/pci-xtalk-bridge.c | 2 +- arch/mips/ralink/irq.c | 2 +- arch/mips/sgi-ip27/ip27-irq.c | 2 +- arch/mips/sgi-ip30/ip30-irq.c | 2 +- arch/nios2/kernel/irq.c | 5 +- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/powerpc/kvm/book3s_xive.c | 2 +- arch/powerpc/platforms/44x/uic.c | 9 +- .../powerpc/platforms/512x/mpc5121_ads_cpld.c | 3 +- arch/powerpc/platforms/52xx/media5200.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 6 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 6 +- .../platforms/85xx/socrates_fpga_pic.c | 4 +- arch/powerpc/platforms/8xx/cpm1-ic.c | 5 +- arch/powerpc/platforms/8xx/pic.c | 5 +- arch/powerpc/platforms/amigaone/setup.c | 2 +- arch/powerpc/platforms/chrp/setup.c | 2 +- .../platforms/embedded6xx/flipper-pic.c | 9 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 7 +- arch/powerpc/platforms/pasemi/setup.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 9 +- arch/powerpc/platforms/powermac/smp.c | 2 +- arch/powerpc/platforms/powernv/opal-irqchip.c | 3 +- arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- arch/powerpc/platforms/ps3/interrupt.c | 4 +- arch/powerpc/platforms/pseries/msi.c | 4 +- arch/powerpc/sysdev/cpm2_pic.c | 5 +- arch/powerpc/sysdev/ehv_pic.c | 9 +- arch/powerpc/sysdev/fsl_msi.c | 2 +- arch/powerpc/sysdev/ge/ge_pic.c | 7 +- arch/powerpc/sysdev/i8259.c | 4 +- arch/powerpc/sysdev/ipic.c | 9 +- arch/powerpc/sysdev/mpic.c | 12 +- arch/powerpc/sysdev/tsi108_pci.c | 4 +- arch/powerpc/sysdev/xics/xics-common.c | 2 +- arch/powerpc/sysdev/xive/common.c | 4 +- arch/sh/boards/mach-se/7343/irq.c | 7 +- arch/sh/boards/mach-se/7722/irq.c | 4 +- arch/sh/boards/mach-x3proto/gpio.c | 2 +- arch/um/drivers/virt-pci.c | 15 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 2 +- drivers/bus/moxtet.c | 6 +- drivers/cdx/cdx_msi.c | 4 +- drivers/edac/altera_edac.c | 4 +- drivers/gpio/gpio-brcmstb.c | 2 +- drivers/gpio/gpio-davinci.c | 5 +- drivers/gpio/gpio-em.c | 5 +- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-idt3243x.c | 2 +- drivers/gpio/gpio-lpc18xx.c | 8 +- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-mxs.c | 4 +- drivers/gpio/gpio-pxa.c | 6 +- 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 | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 +- drivers/gpu/drm/msm/msm_mdss.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 8 +- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 8 +- drivers/iio/adc/stm32-adc-core.c | 7 +- drivers/irqchip/exynos-combiner.c | 2 +- drivers/irqchip/irq-al-fic.c | 2 +- drivers/irqchip/irq-alpine-msi.c | 7 +- drivers/irqchip/irq-apple-aic.c | 4 +- drivers/irqchip/irq-armada-370-xp.c | 18 +- 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 | 4 +- drivers/irqchip/irq-ath79-misc.c | 4 +- drivers/irqchip/irq-atmel-aic-common.c | 2 +- drivers/irqchip/irq-bcm2712-mip.c | 4 +- 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 | 6 +- drivers/irqchip/irq-crossbar.c | 6 +- drivers/irqchip/irq-csky-apb-intc.c | 2 +- drivers/irqchip/irq-csky-mpintc.c | 2 +- drivers/irqchip/irq-davinci-cp-intc.c | 6 +- drivers/irqchip/irq-digicolor.c | 2 +- drivers/irqchip/irq-dw-apb-ictl.c | 2 +- drivers/irqchip/irq-ftintc010.c | 5 +- drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/irqchip/irq-gic-v3.c | 4 +- drivers/irqchip/irq-goldfish-pic.c | 7 +- drivers/irqchip/irq-hip04.c | 6 +- drivers/irqchip/irq-i8259.c | 4 +- drivers/irqchip/irq-idt3243x.c | 2 +- drivers/irqchip/irq-imgpdc.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 6 +- drivers/irqchip/irq-imx-intmux.c | 2 +- drivers/irqchip/irq-imx-irqsteer.c | 2 +- drivers/irqchip/irq-ingenic-tcu.c | 4 +- drivers/irqchip/irq-ingenic.c | 4 +- drivers/irqchip/irq-ixp4xx.c | 2 +- drivers/irqchip/irq-jcore-aic.c | 5 +- drivers/irqchip/irq-keystone.c | 4 +- drivers/irqchip/irq-lan966x-oic.c | 2 +- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 2 +- drivers/irqchip/irq-loongson-htvec.c | 2 +- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- drivers/irqchip/irq-lpc32xx.c | 4 +- drivers/irqchip/irq-ls-extirq.c | 4 +- drivers/irqchip/irq-ls-scfg-msi.c | 10 +- drivers/irqchip/irq-ls1x.c | 4 +- drivers/irqchip/irq-mchp-eic.c | 5 +- drivers/irqchip/irq-meson-gpio.c | 2 +- drivers/irqchip/irq-mips-cpu.c | 13 +- drivers/irqchip/irq-mips-gic.c | 15 +- drivers/irqchip/irq-mmp.c | 12 +- drivers/irqchip/irq-mscc-ocelot.c | 4 +- drivers/irqchip/irq-mst-intc.c | 4 +- drivers/irqchip/irq-mtk-cirq.c | 5 +- drivers/irqchip/irq-mtk-sysirq.c | 4 +- drivers/irqchip/irq-mvebu-gicp.c | 2 +- drivers/irqchip/irq-mvebu-odmi.c | 2 +- drivers/irqchip/irq-mvebu-pic.c | 4 +- drivers/irqchip/irq-mvebu-sei.c | 6 +- drivers/irqchip/irq-mxs.c | 4 +- drivers/irqchip/irq-nvic.c | 2 +- drivers/irqchip/irq-omap-intc.c | 4 +- drivers/irqchip/irq-or1k-pic.c | 4 +- drivers/irqchip/irq-orion.c | 6 +- drivers/irqchip/irq-owl-sirq.c | 4 +- drivers/irqchip/irq-pic32-evic.c | 8 +- drivers/irqchip/irq-pruss-intc.c | 4 +- drivers/irqchip/irq-qcom-mpm.c | 2 +- drivers/irqchip/irq-realtek-rtl.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 6 +- drivers/irqchip/irq-renesas-irqc.c | 4 +- drivers/irqchip/irq-renesas-rza1.c | 6 +- drivers/irqchip/irq-renesas-rzg2l.c | 6 +- drivers/irqchip/irq-renesas-rzv2h.c | 5 +- drivers/irqchip/irq-riscv-intc.c | 2 +- drivers/irqchip/irq-sa11x0.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 6 +- drivers/irqchip/irq-sp7021-intc.c | 4 +- drivers/irqchip/irq-starfive-jh8100-intc.c | 4 +- drivers/irqchip/irq-stm32-exti.c | 4 +- drivers/irqchip/irq-stm32mp-exti.c | 9 +- drivers/irqchip/irq-sun4i.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 4 +- drivers/irqchip/irq-sunxi-nmi.c | 2 +- drivers/irqchip/irq-tb10x.c | 8 +- drivers/irqchip/irq-tegra.c | 5 +- drivers/irqchip/irq-ti-sci-inta.c | 10 +- drivers/irqchip/irq-ti-sci-intr.c | 7 +- drivers/irqchip/irq-ts4800.c | 2 +- drivers/irqchip/irq-uniphier-aidet.c | 2 +- drivers/irqchip/irq-versatile-fpga.c | 4 +- drivers/irqchip/irq-vf610-mscm-ir.c | 6 +- drivers/irqchip/irq-vic.c | 5 +- drivers/irqchip/irq-vt8500.c | 2 +- drivers/irqchip/irq-wpcm450-aic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 6 +- drivers/irqchip/irq-xtensa-mx.c | 7 +- drivers/irqchip/irq-xtensa-pic.c | 8 +- drivers/irqchip/irq-zevio.c | 4 +- drivers/irqchip/spear-shirq.c | 2 +- drivers/mailbox/qcom-ipcc.c | 4 +- drivers/memory/omap-gpmc.c | 6 +- drivers/mfd/88pm860x-core.c | 4 +- drivers/mfd/ab8500-core.c | 6 +- drivers/mfd/arizona-irq.c | 3 +- drivers/mfd/db8500-prcmu.c | 6 +- drivers/mfd/fsl-imx25-tsadc.c | 5 +- drivers/mfd/lp8788-irq.c | 2 +- drivers/mfd/max8925-core.c | 4 +- drivers/mfd/max8997-irq.c | 4 +- drivers/mfd/max8998-irq.c | 2 +- drivers/mfd/mt6358-irq.c | 6 +- drivers/mfd/mt6397-irq.c | 6 +- drivers/mfd/qcom-pm8xxx.c | 6 +- drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe.c | 4 +- drivers/mfd/tc3589x.c | 6 +- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/twl4030-irq.c | 4 +- drivers/mfd/twl6030-irq.c | 5 +- drivers/mfd/wm831x-irq.c | 15 +- drivers/mfd/wm8994-irq.c | 4 +- drivers/misc/hi6421v600-irq.c | 5 +- drivers/net/dsa/microchip/ksz_common.c | 5 +- drivers/net/dsa/microchip/ksz_ptp.c | 4 +- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- drivers/net/dsa/mv88e6xxx/global2.c | 6 +- drivers/net/dsa/qca/ar9331.c | 4 +- drivers/net/dsa/realtek/rtl8365mb.c | 4 +- drivers/net/dsa/realtek/rtl8366rb.c | 6 +- .../net/ethernet/wangxun/txgbe/txgbe_irq.c | 6 +- drivers/net/usb/lan78xx.c | 9 +- drivers/pci/controller/dwc/pci-dra7xx.c | 4 +- drivers/pci/controller/dwc/pci-keystone.c | 2 +- .../pci/controller/dwc/pcie-designware-host.c | 2 +- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 4 +- drivers/pci/controller/dwc/pcie-uniphier.c | 2 +- .../controller/mobiveil/pcie-mobiveil-host.c | 11 +- drivers/pci/controller/pci-aardvark.c | 14 +- drivers/pci/controller/pci-ftpci100.c | 4 +- drivers/pci/controller/pci-mvebu.c | 6 +- drivers/pci/controller/pci-xgene-msi.c | 5 +- drivers/pci/controller/pcie-altera-msi.c | 4 +- drivers/pci/controller/pcie-altera.c | 2 +- drivers/pci/controller/pcie-brcmstb.c | 4 +- drivers/pci/controller/pcie-iproc-msi.c | 6 +- drivers/pci/controller/pcie-mediatek-gen3.c | 9 +- drivers/pci/controller/pcie-mediatek.c | 6 +- drivers/pci/controller/pcie-rockchip-host.c | 4 +- drivers/pci/controller/pcie-xilinx-cpm.c | 10 +- drivers/pci/controller/pcie-xilinx-dma-pl.c | 14 +- drivers/pci/controller/pcie-xilinx-nwl.c | 11 +- drivers/pci/controller/pcie-xilinx.c | 5 +- drivers/pci/controller/plda/pcie-plda-host.c | 16 +- drivers/pinctrl/mediatek/mtk-eint.c | 5 +- drivers/pinctrl/pinctrl-at91-pio4.c | 2 +- drivers/pinctrl/pinctrl-keembay.c | 2 +- drivers/pinctrl/pinctrl-single.c | 9 +- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 7 +- drivers/platform/x86/asus-tf103c-dock.c | 2 +- drivers/remoteproc/pru_rproc.c | 2 +- drivers/sh/intc/irqdomain.c | 5 +- drivers/soc/dove/pmu.c | 4 +- drivers/soc/fsl/qe/qe_ic.c | 8 +- drivers/soc/qcom/smp2p.c | 2 +- drivers/soc/qcom/smsm.c | 2 +- drivers/soc/tegra/pmc.c | 5 +- drivers/spmi/spmi-pmic-arb.c | 2 +- drivers/ssb/driver_gpio.c | 8 +- drivers/thermal/qcom/lmh.c | 3 +- drivers/thermal/tegra/soctherm.c | 2 +- include/linux/gpio/driver.h | 5 +- include/linux/irqdomain.h | 211 ++++++++---------- kernel/irq/irqdomain.c | 88 +------- sound/soc/codecs/wcd937x.c | 2 +- sound/soc/codecs/wcd938x.c | 2 +- sound/soc/codecs/wcd939x.c | 2 +- 272 files changed, 838 insertions(+), 945 deletions(-)
Signature · 1 line
2.49.0
PATCH v2 1/57 irqdomain: um: use irq_domain_create_linear() helper
um_pci_init() open-codes what the irq_domain_create_linear() helper does already. Use the helper instead of open-coding it.
This needs retval checking modification.
[v2]
This is new in v2.
--- arch/um/drivers/virt-pci.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
arch/um/drivers/virt-pci.c +5 -10
@@ -1000,11 +1000,6 @@ static struct resource virt_platform_resource = {static int __init um_pci_init (void ) { -struct irq_domain_info inner_domain_info = { - .size =MAX_MSI_VECTORS , - .hwirq_max =MAX_MSI_VECTORS , - .ops = &um_pci_inner_domain_ops, - };int err, i; WARN_ON(logic_iomem_add_region(&virt_cfgspace_resource,
@@ -1030,10 +1025,10 @@ static int __init um_pci_init(void) goto free; } - inner_domain_info.fwnode = um_pci_fwnode; - um_pci_inner_domain =irq_domain_instantiate (&inner_domain_info); -if (IS_ERR (um_pci_inner_domain)) { - err =PTR_ERR (um_pci_inner_domain); + um_pci_inner_domain =irq_domain_create_linear (um_pci_fwnode,MAX_MSI_VECTORS , + &um_pci_inner_domain_ops,NULL ); +if (!um_pci_inner_domain) { + err = -ENOMEM ; goto free; }
@@ -1070,7 +1065,7 @@ static int __init um_pci_init(void) goto free;return 0 ; free: -if (!IS_ERR_OR_NULL (um_pci_inner_domain)) +if (um_pci_inner_domain)irq_domain_remove (um_pci_inner_domain);if (um_pci_fwnode)irq_domain_free_fwnode (um_pci_fwnode);
Signature · 1 line
2.49.0
Re: [PATCH v2 01/57] irqdomain: um: use irq_domain_create_linear() helper
@UM maintainers: if you have not read 00/57 [1], please route this through your tree.
[1] https://lore.kernel.org/all/[email protected]/
Thanks.
Quoted 57 lines · Jiri Slaby (SUSE)
um_pci_init()open-codes what theirq_domain_create_linear()helper does already. Use the helper instead of open-coding it.This needs retval checking modification.
Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Richard Weinberger <[email protected]>Cc Anton Ivanov <[email protected]>Cc Johannes Berg <[email protected]>[v2]
This is new in v2.--- arch/um/drivers/virt-pci.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)arch/um/drivers/virt-pci.c +5
-10@@ -1000,11 +1000,6 @@ static struct resource virt_platform_resource = {static int __init um_pci_init (void ) { -struct irq_domain_info inner_domain_info = { - .size =MAX_MSI_VECTORS , - .hwirq_max =MAX_MSI_VECTORS , - .ops = &um_pci_inner_domain_ops, - };int err, i; WARN_ON(logic_iomem_add_region(&virt_cfgspace_resource,@@ -1030,10 +1025,10 @@ static int __init um_pci_init(void) goto free; } - inner_domain_info.fwnode = um_pci_fwnode; - um_pci_inner_domain =irq_domain_instantiate (&inner_domain_info); -if (IS_ERR (um_pci_inner_domain)) { - err =PTR_ERR (um_pci_inner_domain); + um_pci_inner_domain =irq_domain_create_linear (um_pci_fwnode,MAX_MSI_VECTORS , + &um_pci_inner_domain_ops,NULL ); +if (!um_pci_inner_domain) { + err = -ENOMEM ; goto free; }@@ -1070,7 +1065,7 @@ static int __init um_pci_init(void) goto free;return 0 ; free: -if (!IS_ERR_OR_NULL (um_pci_inner_domain)) +if (um_pci_inner_domain)irq_domain_remove (um_pci_inner_domain);if (um_pci_fwnode)irq_domain_free_fwnode (um_pci_fwnode);
Signature · 2 lines
js suse labs
[tip: irq/cleanups] um: Use irq_domain_create_linear() helper
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 48199713a6a8115172534a2c4d23ec15938e8af5 Gitweb: https://git.kernel.org/tip/48199713a6a8115172534a2c4d23ec15938e8af5 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:54 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:03 +02:00
um: Use irq_domain_create_linear() helper
um_pci_init() open-codes what the irq_domain_create_linear() helper does already. Use the helper instead of open-coding it.
[ tglx: Fix up subject prefix ]
--- arch/um/drivers/virt-pci.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
arch/um/drivers/virt-pci.c +5 -10
@@ -538,11 +538,6 @@ void um_pci_platform_device_unregister(struct um_pci_device *dev)static int __init um_pci_init (void ) { -struct irq_domain_info inner_domain_info = { - .size =MAX_MSI_VECTORS , - .hwirq_max =MAX_MSI_VECTORS , - .ops = &um_pci_inner_domain_ops, - };int err, i; WARN_ON(logic_iomem_add_region(&virt_cfgspace_resource,
@@ -564,10 +559,10 @@ static int __init um_pci_init(void) goto free; } - inner_domain_info.fwnode = um_pci_fwnode; - um_pci_inner_domain =irq_domain_instantiate (&inner_domain_info); -if (IS_ERR (um_pci_inner_domain)) { - err =PTR_ERR (um_pci_inner_domain); + um_pci_inner_domain =irq_domain_create_linear (um_pci_fwnode,MAX_MSI_VECTORS , + &um_pci_inner_domain_ops,NULL ); +if (!um_pci_inner_domain) { + err = -ENOMEM ; goto free; }
@@ -602,7 +597,7 @@ static int __init um_pci_init(void)return 0 ; free: -if (!IS_ERR_OR_NULL (um_pci_inner_domain)) +if (um_pci_inner_domain)irq_domain_remove (um_pci_inner_domain);if (um_pci_fwnode)irq_domain_free_fwnode (um_pci_fwnode);
PATCH v2 2/57 irqdomain: Rename irq_set_default_host() to irq_set_default_domain()
In reply to Jiri Slaby (SUSE)Call the irq_domain consistently a domain, not host. Here, rename irq_set_default_host() to irq_set_default_domain().
--- arch/arc/kernel/intc-arcv2.c | 2 +- arch/arc/kernel/intc-compact.c | 2 +- arch/arm/mach-pxa/irq.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 6 +++--- arch/mips/sgi-ip27/ip27-irq.c | 2 +- arch/mips/sgi-ip30/ip30-irq.c | 2 +- arch/nios2/kernel/irq.c | 2 +- arch/powerpc/platforms/44x/uic.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- arch/powerpc/platforms/amigaone/setup.c | 2 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- arch/powerpc/platforms/pasemi/setup.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/sysdev/ehv_pic.c | 2 +- arch/powerpc/sysdev/ipic.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/xics/xics-common.c | 2 +- arch/powerpc/sysdev/xive/common.c | 2 +- arch/x86/kernel/apic/vector.c | 2 +- drivers/irqchip/irq-armada-370-xp.c | 2 +- drivers/irqchip/irq-clps711x.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 2 +- drivers/irqchip/irq-pic32-evic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 2 +- drivers/irqchip/irq-xtensa-mx.c | 2 +- drivers/irqchip/irq-xtensa-pic.c | 4 ++-- include/linux/irqdomain.h | 2 +- kernel/irq/irqdomain.c | 8 ++++---- 30 files changed, 36 insertions(+), 36 deletions(-)
arch/arc/kernel/intc-arcv2.c +1 -1
@@ -178,7 +178,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)* Needed for primary domain lookup to succeed * This is a primary irqchip, and can never have a parent */ -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);#ifdef CONFIG_SMP irq_create_mapping (root_domain,IPI_IRQ );
arch/arc/kernel/intc-compact.c +1 -1
@@ -121,7 +121,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)* Needed for primary domain lookup to succeed * This is a primary irqchip, and can never have a parent */ -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }
arch/arm/mach-pxa/irq.c +1 -1
@@ -152,7 +152,7 @@ pxa_init_irq_common(struct device_node *node, int irq_nr, &pxa_irq_ops, NULL);if (!pxa_irq_domain)panic ("Unable to add PXA IRQ domain\n" ); -irq_set_default_host (pxa_irq_domain); +irq_set_default_domain (pxa_irq_domain);for (n =0 ; n < irq_nr; n +=32 ) {void __iomem *base =irq_base (n >>5 );
arch/mips/cavium-octeon/octeon-irq.c +3 -3
@@ -1505,7 +1505,7 @@ static int __init octeon_irq_init_ciu( ciu_domain =irq_domain_add_tree ( ciu_node, &octeon_irq_domain_ciu_ops, dd); -irq_set_default_host (ciu_domain); +irq_set_default_domain (ciu_domain);/* CIU_0 */ for (i =0 ; i <16 ; i++) {
@@ -2076,7 +2076,7 @@ static int __init octeon_irq_init_ciu2( ciu_domain =irq_domain_add_tree ( ciu_node, &octeon_irq_domain_ciu2_ops,NULL ); -irq_set_default_host (ciu_domain); +irq_set_default_domain (ciu_domain);/* CUI2 */ for (i =0 ; i <64 ; i++) {
@@ -2929,7 +2929,7 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,/* Only do per CPU things if it is the CIU of the boot node. */ octeon_irq_ciu3_alloc_resources (ciu3_info);if (node ==0 ) -irq_set_default_host (domain); +irq_set_default_domain (domain); octeon_irq_use_ip4 = false;/* Enable the CIU lines */
arch/mips/sgi-ip27/ip27-irq.c +1 -1
@@ -297,7 +297,7 @@ void __init arch_init_irq(void)if (WARN_ON (domain ==NULL ))return ; -irq_set_default_host (domain); +irq_set_default_domain (domain);irq_set_percpu_devid (IP27_HUB_PEND0_IRQ ); irq_set_chained_handler_and_data(IP27_HUB_PEND0_IRQ, ip27_do_irq_mask0,
arch/mips/sgi-ip30/ip30-irq.c +1 -1
@@ -313,7 +313,7 @@ void __init arch_init_irq(void)if (!domain)return ; -irq_set_default_host (domain); +irq_set_default_domain (domain);irq_set_percpu_devid (IP30_HEART_L0_IRQ ); irq_set_chained_handler_and_data(IP30_HEART_L0_IRQ, ip30_normal_irq,
arch/nios2/kernel/irq.c +1 -1
@@ -72,7 +72,7 @@ void __init init_IRQ(void) domain =irq_domain_add_linear (node,NIOS2_CPU_NR_IRQS , &irq_ops,NULL );BUG_ON (!domain); -irq_set_default_host (domain); +irq_set_default_domain (domain);of_node_put (node);/* Load the initial ienable value */ ienable =RDCTL (CTL_IENABLE );
arch/powerpc/platforms/44x/uic.c +1 -1
@@ -291,7 +291,7 @@ void __init uic_init_tree(void)if (!primary_uic)panic ("Unable to initialize primary UIC %pOF\n" , np); -irq_set_default_host (primary_uic->irqhost); +irq_set_default_domain (primary_uic->irqhost);of_node_put (np);/* The scan again for cascaded UICs */
arch/powerpc/platforms/52xx/mpc52xx_pic.c +1 -1
@@ -453,7 +453,7 @@ void __init mpc52xx_init_irq(void)if (!mpc52xx_irqhost)panic (__FILE__": Cannot allocate the IRQ host\n" ); -irq_set_default_host (mpc52xx_irqhost); +irq_set_default_domain (mpc52xx_irqhost);pr_info ("MPC52xx PIC is up and running!\n" ); }
arch/powerpc/platforms/amigaone/setup.c +1 -1
@@ -109,7 +109,7 @@ static void __init amigaone_init_IRQ(void)i8259_init (pic, int_ack); ppc_md.get_irq = i8259_irq; -irq_set_default_host (i8259_get_host ()); +irq_set_default_domain (i8259_get_host ()); }static int __init request_isa_regions (void )
arch/powerpc/platforms/chrp/setup.c +1 -1
@@ -486,7 +486,7 @@ static void __init chrp_find_8259(void)i8259_init (pic, chrp_int_ack);if (ppc_md.get_irq ==NULL ) { ppc_md.get_irq = i8259_irq; -irq_set_default_host (i8259_get_host ()); +irq_set_default_domain (i8259_get_host ()); }if (chrp_mpic !=NULL ) { cascade_irq =irq_of_parse_and_map (pic,0 );
arch/powerpc/platforms/embedded6xx/flipper-pic.c +1 -1
@@ -190,7 +190,7 @@ void __init flipper_pic_probe(void) flipper_irq_host =flipper_pic_init (np);BUG_ON (!flipper_irq_host); -irq_set_default_host (flipper_irq_host); +irq_set_default_domain (flipper_irq_host);of_node_put (np); }
arch/powerpc/platforms/pasemi/setup.c +1 -1
@@ -228,7 +228,7 @@ static void __init nemo_init_IRQ(struct mpic *mpic)irq_set_chained_handler (gpio_virq, sb600_8259_cascade);mpic_unmask_irq (irq_get_irq_data (gpio_virq)); - irq_set_default_host(mpic->irqhost); + irq_set_default_domain(mpic->irqhost); }#else
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -330,7 +330,7 @@ static void __init pmac_pic_probe_oldstyle(void) pmac_pic_host =irq_domain_add_linear (master, max_irqs, &pmac_pic_host_ops,NULL );BUG_ON (pmac_pic_host ==NULL ); -irq_set_default_host (pmac_pic_host); +irq_set_default_domain (pmac_pic_host);/* Get addresses of first controller if we have a node for it */ BUG_ON (of_address_to_resource (master,0 , &r));
arch/powerpc/platforms/ps3/interrupt.c +1 -1
@@ -744,7 +744,7 @@ void __init ps3_init_IRQ(void)struct irq_domain *host; host =irq_domain_add_nomap (NULL ,PS3_PLUG_MAX +1 , &ps3_host_ops,NULL ); -irq_set_default_host (host); +irq_set_default_domain (host);for_each_possible_cpu (cpu) {struct ps3_private *pd = &per_cpu (ps3_private, cpu);
arch/powerpc/sysdev/ehv_pic.c +1 -1
@@ -291,5 +291,5 @@ void __init ehv_pic_init(void) ehv_pic->coreint_flag =of_property_read_bool (np,"has-external-proxy" ); global_ehv_pic = ehv_pic; -irq_set_default_host (global_ehv_pic->irqhost); +irq_set_default_domain (global_ehv_pic->irqhost); }
arch/powerpc/sysdev/ipic.c +1 -1
@@ -757,7 +757,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)ipic_write (ipic->regs,IPIC_SEMSR , temp); primary_ipic = ipic; -irq_set_default_host (primary_ipic->irqhost); +irq_set_default_domain (primary_ipic->irqhost);ipic_write (ipic->regs,IPIC_SIMSR_H ,0 );ipic_write (ipic->regs,IPIC_SIMSR_L ,0 );
arch/powerpc/sysdev/mpic.c +1 -1
@@ -1520,7 +1520,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,if (!(mpic->flags &MPIC_SECONDARY )) { mpic_primary = mpic; -irq_set_default_host (mpic->irqhost); +irq_set_default_domain (mpic->irqhost); }return mpic;
arch/powerpc/sysdev/xics/xics-common.c +1 -1
@@ -472,7 +472,7 @@ static int __init xics_allocate_domain(void)return -ENOMEM ; } -irq_set_default_host (xics_host); +irq_set_default_domain (xics_host);return 0 ; }
arch/powerpc/sysdev/xive/common.c +1 -1
@@ -1467,7 +1467,7 @@ static void __init xive_init_host(struct device_node *np) xive_irq_domain =irq_domain_add_tree (np, &xive_irq_domain_ops,NULL );if (WARN_ON (xive_irq_domain ==NULL ))return ; -irq_set_default_host (xive_irq_domain); +irq_set_default_domain (xive_irq_domain); }static void xive_cleanup_cpu_queues (unsigned int cpu,struct xive_cpu *xc)
arch/x86/kernel/apic/vector.c +1 -1
@@ -799,7 +799,7 @@ int __init arch_early_irq_init(void) x86_vector_domain =irq_domain_create_tree (fn, &x86_vector_domain_ops,NULL );BUG_ON (x86_vector_domain ==NULL ); -irq_set_default_host (x86_vector_domain); +irq_set_default_domain (x86_vector_domain);BUG_ON (!alloc_cpumask_var (&vector_searchmask,GFP_KERNEL ));
drivers/irqchip/irq-armada-370-xp.c +1 -1
@@ -880,7 +880,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *par }if (mpic_is_ipi_available (mpic)) { -irq_set_default_host (mpic->domain); +irq_set_default_domain (mpic->domain);set_handle_irq (mpic_handle_irq);#ifdef CONFIG_SMP err =mpic_ipi_init (mpic, node);
drivers/irqchip/irq-clps711x.c +1 -1
@@ -191,7 +191,7 @@ static int __init _clps711x_intc_init(struct device_node *np, goto out_irqfree; } -irq_set_default_host (clps711x_intc->domain); +irq_set_default_domain (clps711x_intc->domain);set_handle_irq (clps711x_irqh);#ifdef CONFIG_FIQ
drivers/irqchip/irq-imx-gpcv2.c +1 -1
@@ -247,7 +247,7 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,kfree (cd);return -ENOMEM ; } -irq_set_default_host (domain); +irq_set_default_domain (domain);/* Initially mask all interrupts */ for (i =0 ; i <IMR_NUM ; i++) {
drivers/irqchip/irq-pic32-evic.c +1 -1
@@ -291,7 +291,7 @@ static int __init pic32_of_init(struct device_node *node, gc->private = &priv[i]; } -irq_set_default_host (evic_irq_domain); +irq_set_default_domain (evic_irq_domain);/* * External interrupts have software configurable edge polarity. These
drivers/irqchip/irq-xilinx-intc.c +1 -1
@@ -233,7 +233,7 @@ static int __init xilinx_intc_of_init(struct device_node *intc, } }else { primary_intc = irqc; -irq_set_default_host (primary_intc->root_domain); +irq_set_default_domain (primary_intc->root_domain);set_handle_irq (xil_intc_handle_irq); }
drivers/irqchip/irq-xtensa-mx.c +1 -1
@@ -156,7 +156,7 @@ static void __init xtensa_mx_init_common(struct irq_domain *root_domain) {unsigned int i; -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);secondary_init_irq ();/* Initialize default IRQ routing to CPU 0 */
drivers/irqchip/irq-xtensa-pic.c +2 -2
@@ -87,7 +87,7 @@ int __init xtensa_pic_init_legacy(struct device_node *interrupt_parent)struct irq_domain *root_domain =irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_irq_domain_ops, &xtensa_irq_chip); -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }
@@ -97,7 +97,7 @@ static int __init xtensa_pic_init(struct device_node *np,struct irq_domain *root_domain =irq_domain_add_linear (np,NR_IRQS , &xtensa_irq_domain_ops, &xtensa_irq_chip); -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }IRQCHIP_DECLARE (xtensa_irq_chip,"cdns,xtensa-pic" , xtensa_pic_init);
include/linux/irqdomain.h +1 -1
@@ -352,7 +352,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, void *host_data);struct irq_domain *irq_find_matching_fwspec (struct irq_fwspec *fwspec,enum irq_domain_bus_token bus_token); -void irq_set_default_host (struct irq_domain *host); +void irq_set_default_domain (struct irq_domain *domain);struct irq_domain *irq_get_default_host (void ); int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node,
kernel/irq/irqdomain.c +4 -4
@@ -398,7 +398,7 @@ void irq_domain_remove(struct irq_domain *domain)* If the going away domain is the default one, reset it. */ if (unlikely (irq_default_domain == domain)) -irq_set_default_host (NULL ); +irq_set_default_domain (NULL );mutex_unlock (&irq_domain_mutex);
@@ -573,7 +573,7 @@ struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,EXPORT_SYMBOL_GPL (irq_find_matching_fwspec);/** -* irq_set_default_host() - Set a "default" irq domain +* irq_set_default_domain() - Set a "default" irq domain * @domain: default domain pointer * * For convenience, it's possible to set a "default" domain that will be used
@@ -581,13 +581,13 @@ EXPORT_SYMBOL_GPL(irq_find_matching_fwspec);* platforms that want to manipulate a few hard coded interrupt numbers that * aren't properly represented in the device-tree. */ -void irq_set_default_host (struct irq_domain *domain) +void irq_set_default_domain (struct irq_domain *domain) {pr_debug ("Default domain set to @0x%p\n" , domain); irq_default_domain = domain; } -EXPORT_SYMBOL_GPL (irq_set_default_host); +EXPORT_SYMBOL_GPL (irq_set_default_domain);/** * irq_get_default_host() - Retrieve the "default" irq domain
Signature · 1 line
2.49.0
[tip: irq/urgent] irqdomain: Rename irq_set_default_host() to irq_set_default_domain()
The following commit has been merged into the irq/urgent branch of tip:
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: 825dfab23bca520629a9e5a21ba5b03aaccc75f2 Gitweb: https://git.kernel.org/tip/825dfab23bca520629a9e5a21ba5b03aaccc75f2 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:55 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 04 Apr 2025 16:39:10 +02:00
irqdomain: Rename irq_set_default_host() to irq_set_default_domain()
Naming interrupt domains host is confusing at best and the irqdomain code uses both domain and host inconsistently.
Therefore rename irq_set_default_host() to irq_set_default_domain().
--- arch/arc/kernel/intc-arcv2.c | 2 +- arch/arc/kernel/intc-compact.c | 2 +- arch/arm/mach-pxa/irq.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 6 +++--- arch/mips/sgi-ip27/ip27-irq.c | 2 +- arch/mips/sgi-ip30/ip30-irq.c | 2 +- arch/nios2/kernel/irq.c | 2 +- arch/powerpc/platforms/44x/uic.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- arch/powerpc/platforms/amigaone/setup.c | 2 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- arch/powerpc/platforms/pasemi/setup.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/sysdev/ehv_pic.c | 2 +- arch/powerpc/sysdev/ipic.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/xics/xics-common.c | 2 +- arch/powerpc/sysdev/xive/common.c | 2 +- arch/x86/kernel/apic/vector.c | 2 +- drivers/irqchip/irq-armada-370-xp.c | 2 +- drivers/irqchip/irq-clps711x.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 2 +- drivers/irqchip/irq-pic32-evic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 2 +- drivers/irqchip/irq-xtensa-mx.c | 2 +- drivers/irqchip/irq-xtensa-pic.c | 4 ++-- include/linux/irqdomain.h | 2 +- kernel/irq/irqdomain.c | 8 ++++---- 30 files changed, 36 insertions(+), 36 deletions(-)
arch/arc/kernel/intc-arcv2.c +1 -1
@@ -178,7 +178,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)* Needed for primary domain lookup to succeed * This is a primary irqchip, and can never have a parent */ -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);#ifdef CONFIG_SMP irq_create_mapping (root_domain,IPI_IRQ );
arch/arc/kernel/intc-compact.c +1 -1
@@ -121,7 +121,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)* Needed for primary domain lookup to succeed * This is a primary irqchip, and can never have a parent */ -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }
arch/arm/mach-pxa/irq.c +1 -1
@@ -152,7 +152,7 @@ pxa_init_irq_common(struct device_node *node, int irq_nr, &pxa_irq_ops, NULL);if (!pxa_irq_domain)panic ("Unable to add PXA IRQ domain\n" ); -irq_set_default_host (pxa_irq_domain); +irq_set_default_domain (pxa_irq_domain);for (n =0 ; n < irq_nr; n +=32 ) {void __iomem *base =irq_base (n >>5 );
arch/mips/cavium-octeon/octeon-irq.c +3 -3
@@ -1505,7 +1505,7 @@ static int __init octeon_irq_init_ciu( ciu_domain =irq_domain_add_tree ( ciu_node, &octeon_irq_domain_ciu_ops, dd); -irq_set_default_host (ciu_domain); +irq_set_default_domain (ciu_domain);/* CIU_0 */ for (i =0 ; i <16 ; i++) {
@@ -2076,7 +2076,7 @@ static int __init octeon_irq_init_ciu2( ciu_domain =irq_domain_add_tree ( ciu_node, &octeon_irq_domain_ciu2_ops,NULL ); -irq_set_default_host (ciu_domain); +irq_set_default_domain (ciu_domain);/* CUI2 */ for (i =0 ; i <64 ; i++) {
@@ -2929,7 +2929,7 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,/* Only do per CPU things if it is the CIU of the boot node. */ octeon_irq_ciu3_alloc_resources (ciu3_info);if (node ==0 ) -irq_set_default_host (domain); +irq_set_default_domain (domain); octeon_irq_use_ip4 = false;/* Enable the CIU lines */
arch/mips/sgi-ip27/ip27-irq.c +1 -1
@@ -297,7 +297,7 @@ void __init arch_init_irq(void)if (WARN_ON (domain ==NULL ))return ; -irq_set_default_host (domain); +irq_set_default_domain (domain);irq_set_percpu_devid (IP27_HUB_PEND0_IRQ ); irq_set_chained_handler_and_data(IP27_HUB_PEND0_IRQ, ip27_do_irq_mask0,
arch/mips/sgi-ip30/ip30-irq.c +1 -1
@@ -313,7 +313,7 @@ void __init arch_init_irq(void)if (!domain)return ; -irq_set_default_host (domain); +irq_set_default_domain (domain);irq_set_percpu_devid (IP30_HEART_L0_IRQ ); irq_set_chained_handler_and_data(IP30_HEART_L0_IRQ, ip30_normal_irq,
arch/nios2/kernel/irq.c +1 -1
@@ -72,7 +72,7 @@ void __init init_IRQ(void) domain =irq_domain_add_linear (node,NIOS2_CPU_NR_IRQS , &irq_ops,NULL );BUG_ON (!domain); -irq_set_default_host (domain); +irq_set_default_domain (domain);of_node_put (node);/* Load the initial ienable value */ ienable =RDCTL (CTL_IENABLE );
arch/powerpc/platforms/44x/uic.c +1 -1
@@ -291,7 +291,7 @@ void __init uic_init_tree(void)if (!primary_uic)panic ("Unable to initialize primary UIC %pOF\n" , np); -irq_set_default_host (primary_uic->irqhost); +irq_set_default_domain (primary_uic->irqhost);of_node_put (np);/* The scan again for cascaded UICs */
arch/powerpc/platforms/52xx/mpc52xx_pic.c +1 -1
@@ -453,7 +453,7 @@ void __init mpc52xx_init_irq(void)if (!mpc52xx_irqhost)panic (__FILE__": Cannot allocate the IRQ host\n" ); -irq_set_default_host (mpc52xx_irqhost); +irq_set_default_domain (mpc52xx_irqhost);pr_info ("MPC52xx PIC is up and running!\n" ); }
arch/powerpc/platforms/amigaone/setup.c +1 -1
@@ -109,7 +109,7 @@ static void __init amigaone_init_IRQ(void)i8259_init (pic, int_ack); ppc_md.get_irq = i8259_irq; -irq_set_default_host (i8259_get_host ()); +irq_set_default_domain (i8259_get_host ()); }static int __init request_isa_regions (void )
arch/powerpc/platforms/chrp/setup.c +1 -1
@@ -486,7 +486,7 @@ static void __init chrp_find_8259(void)i8259_init (pic, chrp_int_ack);if (ppc_md.get_irq ==NULL ) { ppc_md.get_irq = i8259_irq; -irq_set_default_host (i8259_get_host ()); +irq_set_default_domain (i8259_get_host ()); }if (chrp_mpic !=NULL ) { cascade_irq =irq_of_parse_and_map (pic,0 );
arch/powerpc/platforms/embedded6xx/flipper-pic.c +1 -1
@@ -190,7 +190,7 @@ void __init flipper_pic_probe(void) flipper_irq_host =flipper_pic_init (np);BUG_ON (!flipper_irq_host); -irq_set_default_host (flipper_irq_host); +irq_set_default_domain (flipper_irq_host);of_node_put (np); }
arch/powerpc/platforms/pasemi/setup.c +1 -1
@@ -228,7 +228,7 @@ static void __init nemo_init_IRQ(struct mpic *mpic)irq_set_chained_handler (gpio_virq, sb600_8259_cascade);mpic_unmask_irq (irq_get_irq_data (gpio_virq)); - irq_set_default_host(mpic->irqhost); + irq_set_default_domain(mpic->irqhost); }#else
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -330,7 +330,7 @@ static void __init pmac_pic_probe_oldstyle(void) pmac_pic_host =irq_domain_add_linear (master, max_irqs, &pmac_pic_host_ops,NULL );BUG_ON (pmac_pic_host ==NULL ); -irq_set_default_host (pmac_pic_host); +irq_set_default_domain (pmac_pic_host);/* Get addresses of first controller if we have a node for it */ BUG_ON (of_address_to_resource (master,0 , &r));
arch/powerpc/platforms/ps3/interrupt.c +1 -1
@@ -744,7 +744,7 @@ void __init ps3_init_IRQ(void)struct irq_domain *host; host =irq_domain_add_nomap (NULL ,PS3_PLUG_MAX +1 , &ps3_host_ops,NULL ); -irq_set_default_host (host); +irq_set_default_domain (host);for_each_possible_cpu (cpu) {struct ps3_private *pd = &per_cpu (ps3_private, cpu);
arch/powerpc/sysdev/ehv_pic.c +1 -1
@@ -291,5 +291,5 @@ void __init ehv_pic_init(void) ehv_pic->coreint_flag =of_property_read_bool (np,"has-external-proxy" ); global_ehv_pic = ehv_pic; -irq_set_default_host (global_ehv_pic->irqhost); +irq_set_default_domain (global_ehv_pic->irqhost); }
arch/powerpc/sysdev/ipic.c +1 -1
@@ -757,7 +757,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)ipic_write (ipic->regs,IPIC_SEMSR , temp); primary_ipic = ipic; -irq_set_default_host (primary_ipic->irqhost); +irq_set_default_domain (primary_ipic->irqhost);ipic_write (ipic->regs,IPIC_SIMSR_H ,0 );ipic_write (ipic->regs,IPIC_SIMSR_L ,0 );
arch/powerpc/sysdev/mpic.c +1 -1
@@ -1520,7 +1520,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,if (!(mpic->flags &MPIC_SECONDARY )) { mpic_primary = mpic; -irq_set_default_host (mpic->irqhost); +irq_set_default_domain (mpic->irqhost); }return mpic;
arch/powerpc/sysdev/xics/xics-common.c +1 -1
@@ -472,7 +472,7 @@ static int __init xics_allocate_domain(void)return -ENOMEM ; } -irq_set_default_host (xics_host); +irq_set_default_domain (xics_host);return 0 ; }
arch/powerpc/sysdev/xive/common.c +1 -1
@@ -1467,7 +1467,7 @@ static void __init xive_init_host(struct device_node *np) xive_irq_domain =irq_domain_add_tree (np, &xive_irq_domain_ops,NULL );if (WARN_ON (xive_irq_domain ==NULL ))return ; -irq_set_default_host (xive_irq_domain); +irq_set_default_domain (xive_irq_domain); }static void xive_cleanup_cpu_queues (unsigned int cpu,struct xive_cpu *xc)
arch/x86/kernel/apic/vector.c +1 -1
@@ -799,7 +799,7 @@ int __init arch_early_irq_init(void) x86_vector_domain =irq_domain_create_tree (fn, &x86_vector_domain_ops,NULL );BUG_ON (x86_vector_domain ==NULL ); -irq_set_default_host (x86_vector_domain); +irq_set_default_domain (x86_vector_domain);BUG_ON (!alloc_cpumask_var (&vector_searchmask,GFP_KERNEL ));
drivers/irqchip/irq-armada-370-xp.c +1 -1
@@ -880,7 +880,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *par }if (mpic_is_ipi_available (mpic)) { -irq_set_default_host (mpic->domain); +irq_set_default_domain (mpic->domain);set_handle_irq (mpic_handle_irq);#ifdef CONFIG_SMP err =mpic_ipi_init (mpic, node);
drivers/irqchip/irq-clps711x.c +1 -1
@@ -191,7 +191,7 @@ static int __init _clps711x_intc_init(struct device_node *np, goto out_irqfree; } -irq_set_default_host (clps711x_intc->domain); +irq_set_default_domain (clps711x_intc->domain);set_handle_irq (clps711x_irqh);#ifdef CONFIG_FIQ
drivers/irqchip/irq-imx-gpcv2.c +1 -1
@@ -247,7 +247,7 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,kfree (cd);return -ENOMEM ; } -irq_set_default_host (domain); +irq_set_default_domain (domain);/* Initially mask all interrupts */ for (i =0 ; i <IMR_NUM ; i++) {
drivers/irqchip/irq-pic32-evic.c +1 -1
@@ -291,7 +291,7 @@ static int __init pic32_of_init(struct device_node *node, gc->private = &priv[i]; } -irq_set_default_host (evic_irq_domain); +irq_set_default_domain (evic_irq_domain);/* * External interrupts have software configurable edge polarity. These
drivers/irqchip/irq-xilinx-intc.c +1 -1
@@ -233,7 +233,7 @@ static int __init xilinx_intc_of_init(struct device_node *intc, } }else { primary_intc = irqc; -irq_set_default_host (primary_intc->root_domain); +irq_set_default_domain (primary_intc->root_domain);set_handle_irq (xil_intc_handle_irq); }
drivers/irqchip/irq-xtensa-mx.c +1 -1
@@ -156,7 +156,7 @@ static void __init xtensa_mx_init_common(struct irq_domain *root_domain) {unsigned int i; -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);secondary_init_irq ();/* Initialize default IRQ routing to CPU 0 */
drivers/irqchip/irq-xtensa-pic.c +2 -2
@@ -87,7 +87,7 @@ int __init xtensa_pic_init_legacy(struct device_node *interrupt_parent)struct irq_domain *root_domain =irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_irq_domain_ops, &xtensa_irq_chip); -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }
@@ -97,7 +97,7 @@ static int __init xtensa_pic_init(struct device_node *np,struct irq_domain *root_domain =irq_domain_add_linear (np,NR_IRQS , &xtensa_irq_domain_ops, &xtensa_irq_chip); -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }IRQCHIP_DECLARE (xtensa_irq_chip,"cdns,xtensa-pic" , xtensa_pic_init);
include/linux/irqdomain.h +1 -1
@@ -352,7 +352,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, void *host_data);struct irq_domain *irq_find_matching_fwspec (struct irq_fwspec *fwspec,enum irq_domain_bus_token bus_token); -void irq_set_default_host (struct irq_domain *host); +void irq_set_default_domain (struct irq_domain *domain);struct irq_domain *irq_get_default_host (void ); int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node,
kernel/irq/irqdomain.c +4 -4
@@ -398,7 +398,7 @@ void irq_domain_remove(struct irq_domain *domain)* If the going away domain is the default one, reset it. */ if (unlikely (irq_default_domain == domain)) -irq_set_default_host (NULL ); +irq_set_default_domain (NULL );mutex_unlock (&irq_domain_mutex);
@@ -573,7 +573,7 @@ struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,EXPORT_SYMBOL_GPL (irq_find_matching_fwspec);/** -* irq_set_default_host() - Set a "default" irq domain +* irq_set_default_domain() - Set a "default" irq domain * @domain: default domain pointer * * For convenience, it's possible to set a "default" domain that will be used
@@ -581,13 +581,13 @@ EXPORT_SYMBOL_GPL(irq_find_matching_fwspec);* platforms that want to manipulate a few hard coded interrupt numbers that * aren't properly represented in the device-tree. */ -void irq_set_default_host (struct irq_domain *domain) +void irq_set_default_domain (struct irq_domain *domain) {pr_debug ("Default domain set to @0x%p\n" , domain); irq_default_domain = domain; } -EXPORT_SYMBOL_GPL (irq_set_default_host); +EXPORT_SYMBOL_GPL (irq_set_default_domain);/** * irq_get_default_host() - Retrieve the "default" irq domain
[tip: timers/cleanups] irqdomain: Rename irq_set_default_host() to irq_set_default_domain()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the timers/cleanups branch of tip:
The following commit has been merged into the timers/cleanups branch of tip:
Commit-ID: 1a6a80a904196a7977f5d355d93f3629bfe44bb2 Gitweb: https://git.kernel.org/tip/1a6a80a904196a7977f5d355d93f3629bfe44bb2 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:55 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 04 Apr 2025 19:26:44 +02:00
irqdomain: Rename irq_set_default_host() to irq_set_default_domain()
Naming interrupt domains host is confusing at best and the irqdomain code uses both domain and host inconsistently.
Therefore rename irq_set_default_host() to irq_set_default_domain().
--- arch/arc/kernel/intc-arcv2.c | 2 +- arch/arc/kernel/intc-compact.c | 2 +- arch/arm/mach-pxa/irq.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 6 +++--- arch/mips/sgi-ip27/ip27-irq.c | 2 +- arch/mips/sgi-ip30/ip30-irq.c | 2 +- arch/nios2/kernel/irq.c | 2 +- arch/powerpc/platforms/44x/uic.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- arch/powerpc/platforms/amigaone/setup.c | 2 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- arch/powerpc/platforms/pasemi/setup.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/sysdev/ehv_pic.c | 2 +- arch/powerpc/sysdev/ipic.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/xics/xics-common.c | 2 +- arch/powerpc/sysdev/xive/common.c | 2 +- arch/x86/kernel/apic/vector.c | 2 +- drivers/irqchip/irq-armada-370-xp.c | 2 +- drivers/irqchip/irq-clps711x.c | 2 +- drivers/irqchip/irq-imx-gpcv2.c | 2 +- drivers/irqchip/irq-pic32-evic.c | 2 +- drivers/irqchip/irq-xilinx-intc.c | 2 +- drivers/irqchip/irq-xtensa-mx.c | 2 +- drivers/irqchip/irq-xtensa-pic.c | 4 ++-- include/linux/irqdomain.h | 2 +- kernel/irq/irqdomain.c | 8 ++++---- 30 files changed, 36 insertions(+), 36 deletions(-)
arch/arc/kernel/intc-arcv2.c +1 -1
@@ -178,7 +178,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)* Needed for primary domain lookup to succeed * This is a primary irqchip, and can never have a parent */ -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);#ifdef CONFIG_SMP irq_create_mapping (root_domain,IPI_IRQ );
arch/arc/kernel/intc-compact.c +1 -1
@@ -121,7 +121,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)* Needed for primary domain lookup to succeed * This is a primary irqchip, and can never have a parent */ -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }
arch/arm/mach-pxa/irq.c +1 -1
@@ -152,7 +152,7 @@ pxa_init_irq_common(struct device_node *node, int irq_nr, &pxa_irq_ops, NULL);if (!pxa_irq_domain)panic ("Unable to add PXA IRQ domain\n" ); -irq_set_default_host (pxa_irq_domain); +irq_set_default_domain (pxa_irq_domain);for (n =0 ; n < irq_nr; n +=32 ) {void __iomem *base =irq_base (n >>5 );
arch/mips/cavium-octeon/octeon-irq.c +3 -3
@@ -1505,7 +1505,7 @@ static int __init octeon_irq_init_ciu( ciu_domain =irq_domain_add_tree ( ciu_node, &octeon_irq_domain_ciu_ops, dd); -irq_set_default_host (ciu_domain); +irq_set_default_domain (ciu_domain);/* CIU_0 */ for (i =0 ; i <16 ; i++) {
@@ -2076,7 +2076,7 @@ static int __init octeon_irq_init_ciu2( ciu_domain =irq_domain_add_tree ( ciu_node, &octeon_irq_domain_ciu2_ops,NULL ); -irq_set_default_host (ciu_domain); +irq_set_default_domain (ciu_domain);/* CUI2 */ for (i =0 ; i <64 ; i++) {
@@ -2929,7 +2929,7 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,/* Only do per CPU things if it is the CIU of the boot node. */ octeon_irq_ciu3_alloc_resources (ciu3_info);if (node ==0 ) -irq_set_default_host (domain); +irq_set_default_domain (domain); octeon_irq_use_ip4 = false;/* Enable the CIU lines */
arch/mips/sgi-ip27/ip27-irq.c +1 -1
@@ -297,7 +297,7 @@ void __init arch_init_irq(void)if (WARN_ON (domain ==NULL ))return ; -irq_set_default_host (domain); +irq_set_default_domain (domain);irq_set_percpu_devid (IP27_HUB_PEND0_IRQ ); irq_set_chained_handler_and_data(IP27_HUB_PEND0_IRQ, ip27_do_irq_mask0,
arch/mips/sgi-ip30/ip30-irq.c +1 -1
@@ -313,7 +313,7 @@ void __init arch_init_irq(void)if (!domain)return ; -irq_set_default_host (domain); +irq_set_default_domain (domain);irq_set_percpu_devid (IP30_HEART_L0_IRQ ); irq_set_chained_handler_and_data(IP30_HEART_L0_IRQ, ip30_normal_irq,
arch/nios2/kernel/irq.c +1 -1
@@ -72,7 +72,7 @@ void __init init_IRQ(void) domain =irq_domain_add_linear (node,NIOS2_CPU_NR_IRQS , &irq_ops,NULL );BUG_ON (!domain); -irq_set_default_host (domain); +irq_set_default_domain (domain);of_node_put (node);/* Load the initial ienable value */ ienable =RDCTL (CTL_IENABLE );
arch/powerpc/platforms/44x/uic.c +1 -1
@@ -291,7 +291,7 @@ void __init uic_init_tree(void)if (!primary_uic)panic ("Unable to initialize primary UIC %pOF\n" , np); -irq_set_default_host (primary_uic->irqhost); +irq_set_default_domain (primary_uic->irqhost);of_node_put (np);/* The scan again for cascaded UICs */
arch/powerpc/platforms/52xx/mpc52xx_pic.c +1 -1
@@ -453,7 +453,7 @@ void __init mpc52xx_init_irq(void)if (!mpc52xx_irqhost)panic (__FILE__": Cannot allocate the IRQ host\n" ); -irq_set_default_host (mpc52xx_irqhost); +irq_set_default_domain (mpc52xx_irqhost);pr_info ("MPC52xx PIC is up and running!\n" ); }
arch/powerpc/platforms/amigaone/setup.c +1 -1
@@ -109,7 +109,7 @@ static void __init amigaone_init_IRQ(void)i8259_init (pic, int_ack); ppc_md.get_irq = i8259_irq; -irq_set_default_host (i8259_get_host ()); +irq_set_default_domain (i8259_get_host ()); }static int __init request_isa_regions (void )
arch/powerpc/platforms/chrp/setup.c +1 -1
@@ -486,7 +486,7 @@ static void __init chrp_find_8259(void)i8259_init (pic, chrp_int_ack);if (ppc_md.get_irq ==NULL ) { ppc_md.get_irq = i8259_irq; -irq_set_default_host (i8259_get_host ()); +irq_set_default_domain (i8259_get_host ()); }if (chrp_mpic !=NULL ) { cascade_irq =irq_of_parse_and_map (pic,0 );
arch/powerpc/platforms/embedded6xx/flipper-pic.c +1 -1
@@ -190,7 +190,7 @@ void __init flipper_pic_probe(void) flipper_irq_host =flipper_pic_init (np);BUG_ON (!flipper_irq_host); -irq_set_default_host (flipper_irq_host); +irq_set_default_domain (flipper_irq_host);of_node_put (np); }
arch/powerpc/platforms/pasemi/setup.c +1 -1
@@ -228,7 +228,7 @@ static void __init nemo_init_IRQ(struct mpic *mpic)irq_set_chained_handler (gpio_virq, sb600_8259_cascade);mpic_unmask_irq (irq_get_irq_data (gpio_virq)); - irq_set_default_host(mpic->irqhost); + irq_set_default_domain(mpic->irqhost); }#else
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -330,7 +330,7 @@ static void __init pmac_pic_probe_oldstyle(void) pmac_pic_host =irq_domain_add_linear (master, max_irqs, &pmac_pic_host_ops,NULL );BUG_ON (pmac_pic_host ==NULL ); -irq_set_default_host (pmac_pic_host); +irq_set_default_domain (pmac_pic_host);/* Get addresses of first controller if we have a node for it */ BUG_ON (of_address_to_resource (master,0 , &r));
arch/powerpc/platforms/ps3/interrupt.c +1 -1
@@ -744,7 +744,7 @@ void __init ps3_init_IRQ(void)struct irq_domain *host; host =irq_domain_add_nomap (NULL ,PS3_PLUG_MAX +1 , &ps3_host_ops,NULL ); -irq_set_default_host (host); +irq_set_default_domain (host);for_each_possible_cpu (cpu) {struct ps3_private *pd = &per_cpu (ps3_private, cpu);
arch/powerpc/sysdev/ehv_pic.c +1 -1
@@ -291,5 +291,5 @@ void __init ehv_pic_init(void) ehv_pic->coreint_flag =of_property_read_bool (np,"has-external-proxy" ); global_ehv_pic = ehv_pic; -irq_set_default_host (global_ehv_pic->irqhost); +irq_set_default_domain (global_ehv_pic->irqhost); }
arch/powerpc/sysdev/ipic.c +1 -1
@@ -757,7 +757,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)ipic_write (ipic->regs,IPIC_SEMSR , temp); primary_ipic = ipic; -irq_set_default_host (primary_ipic->irqhost); +irq_set_default_domain (primary_ipic->irqhost);ipic_write (ipic->regs,IPIC_SIMSR_H ,0 );ipic_write (ipic->regs,IPIC_SIMSR_L ,0 );
arch/powerpc/sysdev/mpic.c +1 -1
@@ -1520,7 +1520,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,if (!(mpic->flags &MPIC_SECONDARY )) { mpic_primary = mpic; -irq_set_default_host (mpic->irqhost); +irq_set_default_domain (mpic->irqhost); }return mpic;
arch/powerpc/sysdev/xics/xics-common.c +1 -1
@@ -472,7 +472,7 @@ static int __init xics_allocate_domain(void)return -ENOMEM ; } -irq_set_default_host (xics_host); +irq_set_default_domain (xics_host);return 0 ; }
arch/powerpc/sysdev/xive/common.c +1 -1
@@ -1467,7 +1467,7 @@ static void __init xive_init_host(struct device_node *np) xive_irq_domain =irq_domain_add_tree (np, &xive_irq_domain_ops,NULL );if (WARN_ON (xive_irq_domain ==NULL ))return ; -irq_set_default_host (xive_irq_domain); +irq_set_default_domain (xive_irq_domain); }static void xive_cleanup_cpu_queues (unsigned int cpu,struct xive_cpu *xc)
arch/x86/kernel/apic/vector.c +1 -1
@@ -799,7 +799,7 @@ int __init arch_early_irq_init(void) x86_vector_domain =irq_domain_create_tree (fn, &x86_vector_domain_ops,NULL );BUG_ON (x86_vector_domain ==NULL ); -irq_set_default_host (x86_vector_domain); +irq_set_default_domain (x86_vector_domain);BUG_ON (!alloc_cpumask_var (&vector_searchmask,GFP_KERNEL ));
drivers/irqchip/irq-armada-370-xp.c +1 -1
@@ -880,7 +880,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *par }if (mpic_is_ipi_available (mpic)) { -irq_set_default_host (mpic->domain); +irq_set_default_domain (mpic->domain);set_handle_irq (mpic_handle_irq);#ifdef CONFIG_SMP err =mpic_ipi_init (mpic, node);
drivers/irqchip/irq-clps711x.c +1 -1
@@ -191,7 +191,7 @@ static int __init _clps711x_intc_init(struct device_node *np, goto out_irqfree; } -irq_set_default_host (clps711x_intc->domain); +irq_set_default_domain (clps711x_intc->domain);set_handle_irq (clps711x_irqh);#ifdef CONFIG_FIQ
drivers/irqchip/irq-imx-gpcv2.c +1 -1
@@ -247,7 +247,7 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node,kfree (cd);return -ENOMEM ; } -irq_set_default_host (domain); +irq_set_default_domain (domain);/* Initially mask all interrupts */ for (i =0 ; i <IMR_NUM ; i++) {
drivers/irqchip/irq-pic32-evic.c +1 -1
@@ -291,7 +291,7 @@ static int __init pic32_of_init(struct device_node *node, gc->private = &priv[i]; } -irq_set_default_host (evic_irq_domain); +irq_set_default_domain (evic_irq_domain);/* * External interrupts have software configurable edge polarity. These
drivers/irqchip/irq-xilinx-intc.c +1 -1
@@ -233,7 +233,7 @@ static int __init xilinx_intc_of_init(struct device_node *intc, } }else { primary_intc = irqc; -irq_set_default_host (primary_intc->root_domain); +irq_set_default_domain (primary_intc->root_domain);set_handle_irq (xil_intc_handle_irq); }
drivers/irqchip/irq-xtensa-mx.c +1 -1
@@ -156,7 +156,7 @@ static void __init xtensa_mx_init_common(struct irq_domain *root_domain) {unsigned int i; -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);secondary_init_irq ();/* Initialize default IRQ routing to CPU 0 */
drivers/irqchip/irq-xtensa-pic.c +2 -2
@@ -87,7 +87,7 @@ int __init xtensa_pic_init_legacy(struct device_node *interrupt_parent)struct irq_domain *root_domain =irq_domain_add_legacy (NULL ,NR_IRQS -1 ,1 ,0 , &xtensa_irq_domain_ops, &xtensa_irq_chip); -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }
@@ -97,7 +97,7 @@ static int __init xtensa_pic_init(struct device_node *np,struct irq_domain *root_domain =irq_domain_add_linear (np,NR_IRQS , &xtensa_irq_domain_ops, &xtensa_irq_chip); -irq_set_default_host (root_domain); +irq_set_default_domain (root_domain);return 0 ; }IRQCHIP_DECLARE (xtensa_irq_chip,"cdns,xtensa-pic" , xtensa_pic_init);
include/linux/irqdomain.h +1 -1
@@ -352,7 +352,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, void *host_data);struct irq_domain *irq_find_matching_fwspec (struct irq_fwspec *fwspec,enum irq_domain_bus_token bus_token); -void irq_set_default_host (struct irq_domain *host); +void irq_set_default_domain (struct irq_domain *domain);struct irq_domain *irq_get_default_host (void ); int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node,
kernel/irq/irqdomain.c +4 -4
@@ -398,7 +398,7 @@ void irq_domain_remove(struct irq_domain *domain)* If the going away domain is the default one, reset it. */ if (unlikely (irq_default_domain == domain)) -irq_set_default_host (NULL ); +irq_set_default_domain (NULL );mutex_unlock (&irq_domain_mutex);
@@ -573,7 +573,7 @@ struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,EXPORT_SYMBOL_GPL (irq_find_matching_fwspec);/** -* irq_set_default_host() - Set a "default" irq domain +* irq_set_default_domain() - Set a "default" irq domain * @domain: default domain pointer * * For convenience, it's possible to set a "default" domain that will be used
@@ -581,13 +581,13 @@ EXPORT_SYMBOL_GPL(irq_find_matching_fwspec);* platforms that want to manipulate a few hard coded interrupt numbers that * aren't properly represented in the device-tree. */ -void irq_set_default_host (struct irq_domain *domain) +void irq_set_default_domain (struct irq_domain *domain) {pr_debug ("Default domain set to @0x%p\n" , domain); irq_default_domain = domain; } -EXPORT_SYMBOL_GPL (irq_set_default_host); +EXPORT_SYMBOL_GPL (irq_set_default_domain);/** * irq_get_default_host() - Retrieve the "default" irq domain
PATCH v2 3/57 irqdomain: Rename irq_get_default_host() to irq_get_default_domain()
In reply to Jiri Slaby (SUSE)Call the irq_domain consistently a domain, not host. Here, rename irq_get_default_host() to irq_get_default_domain().
--- arch/mips/pci/pci-xtalk-bridge.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/powerpc/kvm/book3s_xive.c | 2 +- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/msi.c | 2 +- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- include/linux/irqdomain.h | 2 +- kernel/irq/irqdomain.c | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-)
arch/mips/pci/pci-xtalk-bridge.c +1 -1
@@ -620,7 +620,7 @@ static int bridge_probe(struct platform_device *pdev)if (bridge_get_partnum (virt_to_phys ((void *)bd->bridge_addr), partnum))return -EPROBE_DEFER ;/* not available yet */ - parent =irq_get_default_host (); + parent =irq_get_default_domain ();if (!parent)return -ENODEV ; fn =irq_domain_alloc_named_fwnode ("BRIDGE" );
arch/powerpc/kvm/book3s_hv.c +1 -1
@@ -6041,7 +6041,7 @@ static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)* the underlying calls, which will EOI the interrupt in real * mode, need an HW IRQ number mapped in the XICS IRQ domain. */ - host_data =irq_domain_get_irq_data (irq_get_default_host (), host_irq); + host_data =irq_domain_get_irq_data (irq_get_default_domain (), host_irq); irq_map->r_hwirq = (unsigned int )irqd_to_hwirq (host_data);if (i == pimap->n_mapped)
arch/powerpc/kvm/book3s_xive.c +1 -1
@@ -1555,7 +1555,7 @@ int kvmppc_xive_set_mapped(struct kvm *kvm, unsigned long guest_irq,struct kvmppc_xive_src_block *sb;struct kvmppc_xive_irq_state *state;struct irq_data *host_data = -irq_domain_get_irq_data (irq_get_default_host (), host_irq); +irq_domain_get_irq_data (irq_get_default_domain (), host_irq);unsigned int hw_irq = (unsigned int )irqd_to_hwirq (host_data);u16 idx;u8 prio;
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -1881,7 +1881,7 @@ static const struct irq_domain_ops pnv_irq_domain_ops = {static int __init pnv_msi_allocate_domains (struct pci_controller *hose,unsigned int count) {struct pnv_phb *phb = hose->private_data; -struct irq_domain *parent =irq_get_default_host (); +struct irq_domain *parent =irq_get_default_domain (); hose->fwnode =irq_domain_alloc_named_id_fwnode ("PNV-MSI" , phb->opal_id);if (!hose->fwnode)
arch/powerpc/platforms/pseries/msi.c +1 -1
@@ -611,7 +611,7 @@ static const struct irq_domain_ops pseries_irq_domain_ops = {static int __pseries_msi_allocate_domains (struct pci_controller *phb,unsigned int count) { -struct irq_domain *parent =irq_get_default_host (); +struct irq_domain *parent =irq_get_default_domain (); phb->fwnode =irq_domain_alloc_named_id_fwnode ("pSeries-MSI" , phb->global_number);
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -564,7 +564,7 @@ static void mpic_reenable_percpu(struct mpic *mpic)static int mpic_starting_cpu (unsigned int cpu) { -struct mpic *mpic =irq_get_default_host ()->host_data; +struct mpic *mpic =irq_get_default_domain ()->host_data;mpic_perf_init (mpic);mpic_smp_cpu_init (mpic);
@@ -700,7 +700,7 @@ static void mpic_handle_cascade_irq(struct irq_desc *desc) static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs) { -struct mpic *mpic =irq_get_default_host ()->host_data; +struct mpic *mpic =irq_get_default_domain ()->host_data;irq_hw_number_t i;u32 irqstat;
include/linux/irqdomain.h +1 -1
@@ -353,7 +353,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode,struct irq_domain *irq_find_matching_fwspec (struct irq_fwspec *fwspec,enum irq_domain_bus_token bus_token);void irq_set_default_domain (struct irq_domain *domain); -struct irq_domain *irq_get_default_host (void ); +struct irq_domain *irq_get_default_domain (void );int irq_domain_alloc_descs (int virq,unsigned int nr_irqs,irq_hw_number_t hwirq,int node,const struct irq_affinity_desc *affinity);
kernel/irq/irqdomain.c +3 -3
@@ -590,7 +590,7 @@ void irq_set_default_domain(struct irq_domain *domain)EXPORT_SYMBOL_GPL (irq_set_default_domain);/** -* irq_get_default_host() - Retrieve the "default" irq domain +* irq_get_default_domain() - Retrieve the "default" irq domain * * Returns: the default domain, if any. *
@@ -598,11 +598,11 @@ EXPORT_SYMBOL_GPL(irq_set_default_domain);* systems that cannot implement a firmware->fwnode mapping (which * both DT and ACPI provide). */ -struct irq_domain *irq_get_default_host (void ) +struct irq_domain *irq_get_default_domain (void ) {return irq_default_domain; } -EXPORT_SYMBOL_GPL (irq_get_default_host); +EXPORT_SYMBOL_GPL (irq_get_default_domain);static bool irq_domain_is_nomap (struct irq_domain *domain) {
Signature · 1 line
2.49.0
[tip: irq/urgent] irqdomain: Rename irq_get_default_host() to irq_get_default_domain()
The following commit has been merged into the irq/urgent branch of tip:
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: 0a27ea384c82e70d16e40adbaebeb3725f7e6342 Gitweb: https://git.kernel.org/tip/0a27ea384c82e70d16e40adbaebeb3725f7e6342 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:56 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 04 Apr 2025 16:39:10 +02:00
irqdomain: Rename irq_get_default_host() to irq_get_default_domain()
Naming interrupt domains host is confusing at best and the irqdomain code uses both domain and host inconsistently.
Therefore rename irq_get_default_host() to irq_get_default_domain().
--- arch/mips/pci/pci-xtalk-bridge.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/powerpc/kvm/book3s_xive.c | 2 +- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/msi.c | 2 +- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- include/linux/irqdomain.h | 2 +- kernel/irq/irqdomain.c | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-)
arch/mips/pci/pci-xtalk-bridge.c +1 -1
@@ -620,7 +620,7 @@ static int bridge_probe(struct platform_device *pdev)if (bridge_get_partnum (virt_to_phys ((void *)bd->bridge_addr), partnum))return -EPROBE_DEFER ;/* not available yet */ - parent =irq_get_default_host (); + parent =irq_get_default_domain ();if (!parent)return -ENODEV ; fn =irq_domain_alloc_named_fwnode ("BRIDGE" );
arch/powerpc/kvm/book3s_hv.c +1 -1
@@ -6041,7 +6041,7 @@ static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)* the underlying calls, which will EOI the interrupt in real * mode, need an HW IRQ number mapped in the XICS IRQ domain. */ - host_data =irq_domain_get_irq_data (irq_get_default_host (), host_irq); + host_data =irq_domain_get_irq_data (irq_get_default_domain (), host_irq); irq_map->r_hwirq = (unsigned int )irqd_to_hwirq (host_data);if (i == pimap->n_mapped)
arch/powerpc/kvm/book3s_xive.c +1 -1
@@ -1555,7 +1555,7 @@ int kvmppc_xive_set_mapped(struct kvm *kvm, unsigned long guest_irq,struct kvmppc_xive_src_block *sb;struct kvmppc_xive_irq_state *state;struct irq_data *host_data = -irq_domain_get_irq_data (irq_get_default_host (), host_irq); +irq_domain_get_irq_data (irq_get_default_domain (), host_irq);unsigned int hw_irq = (unsigned int )irqd_to_hwirq (host_data);u16 idx;u8 prio;
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -1881,7 +1881,7 @@ static const struct irq_domain_ops pnv_irq_domain_ops = {static int __init pnv_msi_allocate_domains (struct pci_controller *hose,unsigned int count) {struct pnv_phb *phb = hose->private_data; -struct irq_domain *parent =irq_get_default_host (); +struct irq_domain *parent =irq_get_default_domain (); hose->fwnode =irq_domain_alloc_named_id_fwnode ("PNV-MSI" , phb->opal_id);if (!hose->fwnode)
arch/powerpc/platforms/pseries/msi.c +1 -1
@@ -611,7 +611,7 @@ static const struct irq_domain_ops pseries_irq_domain_ops = {static int __pseries_msi_allocate_domains (struct pci_controller *phb,unsigned int count) { -struct irq_domain *parent =irq_get_default_host (); +struct irq_domain *parent =irq_get_default_domain (); phb->fwnode =irq_domain_alloc_named_id_fwnode ("pSeries-MSI" , phb->global_number);
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -564,7 +564,7 @@ static void mpic_reenable_percpu(struct mpic *mpic)static int mpic_starting_cpu (unsigned int cpu) { -struct mpic *mpic =irq_get_default_host ()->host_data; +struct mpic *mpic =irq_get_default_domain ()->host_data;mpic_perf_init (mpic);mpic_smp_cpu_init (mpic);
@@ -700,7 +700,7 @@ static void mpic_handle_cascade_irq(struct irq_desc *desc) static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs) { -struct mpic *mpic =irq_get_default_host ()->host_data; +struct mpic *mpic =irq_get_default_domain ()->host_data;irq_hw_number_t i;u32 irqstat;
include/linux/irqdomain.h +1 -1
@@ -353,7 +353,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode,struct irq_domain *irq_find_matching_fwspec (struct irq_fwspec *fwspec,enum irq_domain_bus_token bus_token);void irq_set_default_domain (struct irq_domain *domain); -struct irq_domain *irq_get_default_host (void ); +struct irq_domain *irq_get_default_domain (void );int irq_domain_alloc_descs (int virq,unsigned int nr_irqs,irq_hw_number_t hwirq,int node,const struct irq_affinity_desc *affinity);
kernel/irq/irqdomain.c +3 -3
@@ -590,7 +590,7 @@ void irq_set_default_domain(struct irq_domain *domain)EXPORT_SYMBOL_GPL (irq_set_default_domain);/** -* irq_get_default_host() - Retrieve the "default" irq domain +* irq_get_default_domain() - Retrieve the "default" irq domain * * Returns: the default domain, if any. *
@@ -598,11 +598,11 @@ EXPORT_SYMBOL_GPL(irq_set_default_domain);* systems that cannot implement a firmware->fwnode mapping (which * both DT and ACPI provide). */ -struct irq_domain *irq_get_default_host (void ) +struct irq_domain *irq_get_default_domain (void ) {return irq_default_domain; } -EXPORT_SYMBOL_GPL (irq_get_default_host); +EXPORT_SYMBOL_GPL (irq_get_default_domain);static bool irq_domain_is_nomap (struct irq_domain *domain) {
[tip: timers/cleanups] irqdomain: Rename irq_get_default_host() to irq_get_default_domain()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the timers/cleanups branch of tip:
The following commit has been merged into the timers/cleanups branch of tip:
Commit-ID: ae7746fbed18ce29997da5bd7ffd983ba9a96e05 Gitweb: https://git.kernel.org/tip/ae7746fbed18ce29997da5bd7ffd983ba9a96e05 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:56 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 04 Apr 2025 19:26:45 +02:00
irqdomain: Rename irq_get_default_host() to irq_get_default_domain()
Naming interrupt domains host is confusing at best and the irqdomain code uses both domain and host inconsistently.
Therefore rename irq_get_default_host() to irq_get_default_domain().
--- arch/mips/pci/pci-xtalk-bridge.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/powerpc/kvm/book3s_xive.c | 2 +- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/msi.c | 2 +- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- include/linux/irqdomain.h | 2 +- kernel/irq/irqdomain.c | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-)
arch/mips/pci/pci-xtalk-bridge.c +1 -1
@@ -620,7 +620,7 @@ static int bridge_probe(struct platform_device *pdev)if (bridge_get_partnum (virt_to_phys ((void *)bd->bridge_addr), partnum))return -EPROBE_DEFER ;/* not available yet */ - parent =irq_get_default_host (); + parent =irq_get_default_domain ();if (!parent)return -ENODEV ; fn =irq_domain_alloc_named_fwnode ("BRIDGE" );
arch/powerpc/kvm/book3s_hv.c +1 -1
@@ -6041,7 +6041,7 @@ static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)* the underlying calls, which will EOI the interrupt in real * mode, need an HW IRQ number mapped in the XICS IRQ domain. */ - host_data =irq_domain_get_irq_data (irq_get_default_host (), host_irq); + host_data =irq_domain_get_irq_data (irq_get_default_domain (), host_irq); irq_map->r_hwirq = (unsigned int )irqd_to_hwirq (host_data);if (i == pimap->n_mapped)
arch/powerpc/kvm/book3s_xive.c +1 -1
@@ -1555,7 +1555,7 @@ int kvmppc_xive_set_mapped(struct kvm *kvm, unsigned long guest_irq,struct kvmppc_xive_src_block *sb;struct kvmppc_xive_irq_state *state;struct irq_data *host_data = -irq_domain_get_irq_data (irq_get_default_host (), host_irq); +irq_domain_get_irq_data (irq_get_default_domain (), host_irq);unsigned int hw_irq = (unsigned int )irqd_to_hwirq (host_data);u16 idx;u8 prio;
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -1881,7 +1881,7 @@ static const struct irq_domain_ops pnv_irq_domain_ops = {static int __init pnv_msi_allocate_domains (struct pci_controller *hose,unsigned int count) {struct pnv_phb *phb = hose->private_data; -struct irq_domain *parent =irq_get_default_host (); +struct irq_domain *parent =irq_get_default_domain (); hose->fwnode =irq_domain_alloc_named_id_fwnode ("PNV-MSI" , phb->opal_id);if (!hose->fwnode)
arch/powerpc/platforms/pseries/msi.c +1 -1
@@ -611,7 +611,7 @@ static const struct irq_domain_ops pseries_irq_domain_ops = {static int __pseries_msi_allocate_domains (struct pci_controller *phb,unsigned int count) { -struct irq_domain *parent =irq_get_default_host (); +struct irq_domain *parent =irq_get_default_domain (); phb->fwnode =irq_domain_alloc_named_id_fwnode ("pSeries-MSI" , phb->global_number);
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -564,7 +564,7 @@ static void mpic_reenable_percpu(struct mpic *mpic)static int mpic_starting_cpu (unsigned int cpu) { -struct mpic *mpic =irq_get_default_host ()->host_data; +struct mpic *mpic =irq_get_default_domain ()->host_data;mpic_perf_init (mpic);mpic_smp_cpu_init (mpic);
@@ -700,7 +700,7 @@ static void mpic_handle_cascade_irq(struct irq_desc *desc) static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs) { -struct mpic *mpic =irq_get_default_host ()->host_data; +struct mpic *mpic =irq_get_default_domain ()->host_data;irq_hw_number_t i;u32 irqstat;
include/linux/irqdomain.h +1 -1
@@ -353,7 +353,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode,struct irq_domain *irq_find_matching_fwspec (struct irq_fwspec *fwspec,enum irq_domain_bus_token bus_token);void irq_set_default_domain (struct irq_domain *domain); -struct irq_domain *irq_get_default_host (void ); +struct irq_domain *irq_get_default_domain (void );int irq_domain_alloc_descs (int virq,unsigned int nr_irqs,irq_hw_number_t hwirq,int node,const struct irq_affinity_desc *affinity);
kernel/irq/irqdomain.c +3 -3
@@ -590,7 +590,7 @@ void irq_set_default_domain(struct irq_domain *domain)EXPORT_SYMBOL_GPL (irq_set_default_domain);/** -* irq_get_default_host() - Retrieve the "default" irq domain +* irq_get_default_domain() - Retrieve the "default" irq domain * * Returns: the default domain, if any. *
@@ -598,11 +598,11 @@ EXPORT_SYMBOL_GPL(irq_set_default_domain);* systems that cannot implement a firmware->fwnode mapping (which * both DT and ACPI provide). */ -struct irq_domain *irq_get_default_host (void ) +struct irq_domain *irq_get_default_domain (void ) {return irq_default_domain; } -EXPORT_SYMBOL_GPL (irq_get_default_host); +EXPORT_SYMBOL_GPL (irq_get_default_domain);static bool irq_domain_is_nomap (struct irq_domain *domain) {
PATCH v2 4/57 irqdomain.h: Stop using 'host' for domain
In reply to Jiri Slaby (SUSE)It is confusing to see 'host' and 'domain' to be used as 'domain'. Given this header is all about domains, switch the remaining 'host' uses to 'domain'.
--- include/linux/irqdomain.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/irqdomain.h +6 -6
@@ -72,7 +72,7 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args,/** * struct irq_domain_ops - Methods for irq_domain objects -* @match: Match an interrupt controller device node to a host, returns +* @match: Match an interrupt controller device node to a domain, returns * 1 on a match * @select: Match an interrupt controller fw specification. It is more generic * than @match as it receives a complete struct irq_fwspec. Therefore,
@@ -454,7 +454,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nodreturn IS_ERR (d) ?NULL : d; } -unsigned int irq_create_direct_mapping (struct irq_domain *host); +unsigned int irq_create_direct_mapping (struct irq_domain *domain);#endif static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node,
@@ -507,7 +507,7 @@ static inline struct irq_domain *irq_domain_create_tree(struct fwnode_handle *fwreturn IS_ERR (d) ?NULL : d; } -void irq_domain_remove (struct irq_domain *host); +void irq_domain_remove (struct irq_domain *domain);int irq_domain_associate (struct irq_domain *domain,unsigned int irq,irq_hw_number_t hwirq);
@@ -515,16 +515,16 @@ void irq_domain_associate_many(struct irq_domain *domain,unsigned int irq_base, irq_hw_number_t hwirq_base, int count); -unsigned int irq_create_mapping_affinity (struct irq_domain *host, +unsigned int irq_create_mapping_affinity (struct irq_domain *domain,irq_hw_number_t hwirq,const struct irq_affinity_desc *affinity);unsigned int irq_create_fwspec_mapping (struct irq_fwspec *fwspec);void irq_dispose_mapping (unsigned int virq); -static inline unsigned int irq_create_mapping (struct irq_domain *host, +static inline unsigned int irq_create_mapping (struct irq_domain *domain,irq_hw_number_t hwirq) { -return irq_create_mapping_affinity (host, hwirq,NULL ); +return irq_create_mapping_affinity (domain, hwirq,NULL ); } struct irq_desc *__irq_resolve_mapping(struct irq_domain *domain,
Signature · 1 line
2.49.0
[tip: irq/urgent] irqdomain: Stop using 'host' for domain
The following commit has been merged into the irq/urgent branch of tip:
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: d2705d33885e3a19f727dff2521fb7d5b1fc5cda Gitweb: https://git.kernel.org/tip/d2705d33885e3a19f727dff2521fb7d5b1fc5cda Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:57 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 04 Apr 2025 16:39:11 +02:00
irqdomain: Stop using 'host' for domain
It is confusing to see 'host' and 'domain' to be used as 'domain'. Given this header is all about domains, switch the remaining 'host' uses to 'domain'.
--- include/linux/irqdomain.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/irqdomain.h +6 -6
@@ -72,7 +72,7 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args,/** * struct irq_domain_ops - Methods for irq_domain objects -* @match: Match an interrupt controller device node to a host, returns +* @match: Match an interrupt controller device node to a domain, returns * 1 on a match * @select: Match an interrupt controller fw specification. It is more generic * than @match as it receives a complete struct irq_fwspec. Therefore,
@@ -454,7 +454,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nodreturn IS_ERR (d) ?NULL : d; } -unsigned int irq_create_direct_mapping (struct irq_domain *host); +unsigned int irq_create_direct_mapping (struct irq_domain *domain);#endif static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node,
@@ -507,7 +507,7 @@ static inline struct irq_domain *irq_domain_create_tree(struct fwnode_handle *fwreturn IS_ERR (d) ?NULL : d; } -void irq_domain_remove (struct irq_domain *host); +void irq_domain_remove (struct irq_domain *domain);int irq_domain_associate (struct irq_domain *domain,unsigned int irq,irq_hw_number_t hwirq);
@@ -515,16 +515,16 @@ void irq_domain_associate_many(struct irq_domain *domain,unsigned int irq_base, irq_hw_number_t hwirq_base, int count); -unsigned int irq_create_mapping_affinity (struct irq_domain *host, +unsigned int irq_create_mapping_affinity (struct irq_domain *domain,irq_hw_number_t hwirq,const struct irq_affinity_desc *affinity);unsigned int irq_create_fwspec_mapping (struct irq_fwspec *fwspec);void irq_dispose_mapping (unsigned int virq); -static inline unsigned int irq_create_mapping (struct irq_domain *host, +static inline unsigned int irq_create_mapping (struct irq_domain *domain,irq_hw_number_t hwirq) { -return irq_create_mapping_affinity (host, hwirq,NULL ); +return irq_create_mapping_affinity (domain, hwirq,NULL ); } struct irq_desc *__irq_resolve_mapping(struct irq_domain *domain,
[tip: timers/cleanups] irqdomain: Stop using 'host' for domain
In reply to Jiri Slaby (SUSE)The following commit has been merged into the timers/cleanups branch of tip:
The following commit has been merged into the timers/cleanups branch of tip:
Commit-ID: 4ac8868604758be9295aff58e968d7548b499504 Gitweb: https://git.kernel.org/tip/4ac8868604758be9295aff58e968d7548b499504 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:57 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 04 Apr 2025 19:26:45 +02:00
irqdomain: Stop using 'host' for domain
It is confusing to see 'host' and 'domain' to be used as 'domain'. Given this header is all about domains, switch the remaining 'host' uses to 'domain'.
--- include/linux/irqdomain.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/irqdomain.h +6 -6
@@ -72,7 +72,7 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args,/** * struct irq_domain_ops - Methods for irq_domain objects -* @match: Match an interrupt controller device node to a host, returns +* @match: Match an interrupt controller device node to a domain, returns * 1 on a match * @select: Match an interrupt controller fw specification. It is more generic * than @match as it receives a complete struct irq_fwspec. Therefore,
@@ -454,7 +454,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nodreturn IS_ERR (d) ?NULL : d; } -unsigned int irq_create_direct_mapping (struct irq_domain *host); +unsigned int irq_create_direct_mapping (struct irq_domain *domain);#endif static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node,
@@ -507,7 +507,7 @@ static inline struct irq_domain *irq_domain_create_tree(struct fwnode_handle *fwreturn IS_ERR (d) ?NULL : d; } -void irq_domain_remove (struct irq_domain *host); +void irq_domain_remove (struct irq_domain *domain);int irq_domain_associate (struct irq_domain *domain,unsigned int irq,irq_hw_number_t hwirq);
@@ -515,16 +515,16 @@ void irq_domain_associate_many(struct irq_domain *domain,unsigned int irq_base, irq_hw_number_t hwirq_base, int count); -unsigned int irq_create_mapping_affinity (struct irq_domain *host, +unsigned int irq_create_mapping_affinity (struct irq_domain *domain,irq_hw_number_t hwirq,const struct irq_affinity_desc *affinity);unsigned int irq_create_fwspec_mapping (struct irq_fwspec *fwspec);void irq_dispose_mapping (unsigned int virq); -static inline unsigned int irq_create_mapping (struct irq_domain *host, +static inline unsigned int irq_create_mapping (struct irq_domain *domain,irq_hw_number_t hwirq) { -return irq_create_mapping_affinity (host, hwirq,NULL ); +return irq_create_mapping_affinity (domain, hwirq,NULL ); } struct irq_desc *__irq_resolve_mapping(struct irq_domain *domain,
PATCH v2 5/57 irqdomain: cdx: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
--- drivers/cdx/cdx_msi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cdx/cdx_msi.c +2 -2
@@ -165,7 +165,7 @@ struct irq_domain *cdx_msi_domain_init(struct device *dev)struct device_node *parent_node;struct irq_domain *parent; - fwnode_handle =of_node_to_fwnode (np); + fwnode_handle =of_fwnode_handle (np); parent_node =of_parse_phandle (np,"msi-map" ,1 );if (!parent_node) {
@@ -173,7 +173,7 @@ struct irq_domain *cdx_msi_domain_init(struct device *dev)return NULL ; } - parent =irq_find_matching_fwnode (of_node_to_fwnode (parent_node),DOMAIN_BUS_NEXUS ); + parent =irq_find_matching_fwnode (of_fwnode_handle (parent_node),DOMAIN_BUS_NEXUS );if (!parent || !msi_get_domain_info (parent)) {dev_err (dev,"unable to locate ITS domain\n" );return NULL ;
Signature · 1 line
2.49.0
Re: [PATCH v2 05/57] irqdomain: cdx: Switch to of_fwnode_handle()
@cdx maintainers: if you have not read 00/57 [1], please route this through your tree.
[1] https://lore.kernel.org/all/[email protected]/
Thanks.
Quoted 33 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Nipun Gupta <[email protected]>Cc Nikhil Agarwal <[email protected]>--- drivers/cdx/cdx_msi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/cdx/cdx_msi.c +2
-2@@ -165,7 +165,7 @@ struct irq_domain *cdx_msi_domain_init(struct device *dev)struct device_node *parent_node;struct irq_domain *parent; - fwnode_handle =of_node_to_fwnode (np); + fwnode_handle =of_fwnode_handle (np); parent_node =of_parse_phandle (np,"msi-map" ,1 );if (!parent_node) {@@ -173,7 +173,7 @@ struct irq_domain *cdx_msi_domain_init(struct device *dev)return NULL ; } - parent =irq_find_matching_fwnode (of_node_to_fwnode (parent_node),DOMAIN_BUS_NEXUS ); + parent =irq_find_matching_fwnode (of_fwnode_handle (parent_node),DOMAIN_BUS_NEXUS );if (!parent || !msi_get_domain_info (parent)) {dev_err (dev,"unable to locate ITS domain\n" );return NULL ;
Signature · 2 lines
js suse labs
Re: [PATCH v2 05/57] irqdomain: cdx: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)Quoted 7 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Nipun Gupta <[email protected]>Cc Nikhil Agarwal <[email protected]>
PATCH v2 6/57 irqdomain: irqchip: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
--- drivers/irqchip/irq-alpine-msi.c | 2 +- drivers/irqchip/irq-apple-aic.c | 4 ++-- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/irqchip/irq-gic-v3.c | 4 ++-- drivers/irqchip/irq-ixp4xx.c | 2 +- drivers/irqchip/irq-lan966x-oic.c | 2 +- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 2 +- drivers/irqchip/irq-loongson-htvec.c | 2 +- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- drivers/irqchip/irq-ls-scfg-msi.c | 2 +- drivers/irqchip/irq-meson-gpio.c | 2 +- drivers/irqchip/irq-mvebu-gicp.c | 2 +- drivers/irqchip/irq-mvebu-odmi.c | 2 +- drivers/irqchip/irq-mvebu-sei.c | 6 +++--- drivers/irqchip/irq-qcom-mpm.c | 2 +- drivers/irqchip/irq-riscv-intc.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 2 +- drivers/irqchip/irq-stm32mp-exti.c | 2 +- drivers/irqchip/irq-ti-sci-inta.c | 4 ++-- drivers/irqchip/irq-ti-sci-intr.c | 2 +- drivers/irqchip/irq-uniphier-aidet.c | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-)
drivers/irqchip/irq-alpine-msi.c +1 -1
@@ -213,7 +213,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENOMEM ; } - msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &alpine_msix_domain_info, middle_domain);if (!msi_domain) {
drivers/irqchip/irq-apple-aic.c +2 -2
@@ -1014,7 +1014,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p irqc->info.die_stride = off - start_off; - irqc->hw_domain =irq_domain_create_tree (of_node_to_fwnode (node), + irqc->hw_domain =irq_domain_create_tree (of_fwnode_handle (node), &aic_irq_domain_ops, irqc);if (WARN_ON (!irqc->hw_domain)) goto err_unmap;
@@ -1067,7 +1067,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *pif (is_kernel_in_hyp_mode ()) {struct irq_fwspec mi = { - .fwnode =of_node_to_fwnode (node), + .fwnode =of_fwnode_handle (node), .param_count =3 , .param = { [0 ] =AIC_FIQ ,/* This is a lie */
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -353,7 +353,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,if (!mpic->msi_inner_domain)return -ENOMEM ; - mpic->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), &mpic_msi_domain_info, + mpic->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &mpic_msi_domain_info, mpic->msi_inner_domain);if (!mpic->msi_domain) {irq_domain_remove (mpic->msi_inner_domain);
@@ -492,7 +492,7 @@ static int __init mpic_ipi_init(struct mpic *mpic, struct device_node *node) {int base_ipi; - mpic->ipi_domain =irq_domain_create_linear (of_node_to_fwnode (node),IPI_DOORBELL_NR , + mpic->ipi_domain =irq_domain_create_linear (of_fwnode_handle (node),IPI_DOORBELL_NR , &mpic_ipi_domain_ops, mpic);if (WARN_ON (!mpic->ipi_domain))return -ENOMEM ;
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +1 -1
@@ -152,7 +152,7 @@ static void __init its_fsl_mc_of_msi_init(void)if (!of_property_read_bool (np,"msi-controller" ))continue ; -its_fsl_mc_msi_init_one (of_node_to_fwnode (np), +its_fsl_mc_msi_init_one (of_fwnode_handle (np), np->full_name); } }
drivers/irqchip/irq-gic-v3.c +2 -2
@@ -1826,7 +1826,7 @@ static int partition_domain_translate(struct irq_domain *d, ppi_idx =__gic_get_ppi_index (ppi_intid); ret =partition_translate_id (gic_data.ppi_descs[ppi_idx], -of_node_to_fwnode (np)); +of_fwnode_handle (np));if (ret <0 )return ret;
@@ -2192,7 +2192,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) part = &parts[part_idx]; - part->partition_id =of_node_to_fwnode (child_part); + part->partition_id =of_fwnode_handle (child_part);pr_info ("GIC: PPI partition %pOFn[%d] { " , child_part, part_idx);
drivers/irqchip/irq-ixp4xx.c +1 -1
@@ -261,7 +261,7 @@ static int __init ixp4xx_of_init_irq(struct device_node *np,pr_crit ("IXP4XX: could not ioremap interrupt controller\n" );return -ENODEV ; } - fwnode =of_node_to_fwnode (np); + fwnode =of_fwnode_handle (np);/* These chip variants have 64 interrupts */ is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") ||
drivers/irqchip/irq-lan966x-oic.c +1 -1
@@ -224,7 +224,7 @@ static int lan966x_oic_probe(struct platform_device *pdev) .exit = lan966x_oic_chip_exit, };struct irq_domain_info d_info = { - .fwnode =of_node_to_fwnode (pdev->dev.of_node), + .fwnode =of_fwnode_handle (pdev->dev.of_node), .domain_flags =IRQ_DOMAIN_FLAG_DESTROY_GC , .size =LAN966X_OIC_NR_IRQ , .hwirq_max =LAN966X_OIC_NR_IRQ ,
drivers/irqchip/irq-loongarch-cpu.c +1 -1
@@ -100,7 +100,7 @@ static const struct irq_domain_ops loongarch_cpu_intc_irq_domain_ops = {static int __init cpuintc_of_init (struct device_node *of_node,struct device_node *parent) { - cpuintc_handle =of_node_to_fwnode (of_node); + cpuintc_handle =of_fwnode_handle (of_node); irq_domain =irq_domain_create_linear (cpuintc_handle,EXCCODE_INT_NUM , &loongarch_cpu_intc_irq_domain_ops,NULL );
drivers/irqchip/irq-loongson-eiointc.c +1 -1
@@ -554,7 +554,7 @@ static int __init eiointc_of_init(struct device_node *of_node, priv->vec_count =VEC_COUNT ; priv->node =0 ; - priv->domain_handle =of_node_to_fwnode (of_node); + priv->domain_handle =of_fwnode_handle (of_node); ret =eiointc_init (priv, parent_irq,0 );if (ret <0 )
drivers/irqchip/irq-loongson-htvec.c +1 -1
@@ -248,7 +248,7 @@ static int htvec_of_init(struct device_node *node, } err =htvec_init (res.start,resource_size (&res), - num_parents, parent_irq,of_node_to_fwnode (node)); + num_parents, parent_irq,of_fwnode_handle (node));if (err <0 )return err;
drivers/irqchip/irq-loongson-liointc.c +1 -1
@@ -363,7 +363,7 @@ static int __init liointc_of_init(struct device_node *node, } err =liointc_init (res.start,resource_size (&res), - revision,of_node_to_fwnode (node), node); + revision,of_fwnode_handle (node), node);if (err <0 )return err;
drivers/irqchip/irq-loongson-pch-msi.c +1 -1
@@ -243,7 +243,7 @@ static int pch_msi_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_node_to_fwnode (node)); + err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_fwnode_handle (node));if (err <0 )return err;
drivers/irqchip/irq-loongson-pch-pic.c +1 -1
@@ -392,7 +392,7 @@ static int pch_pic_of_init(struct device_node *node, } err =pch_pic_init (res.start,resource_size (&res), vec_base, - parent_domain,of_node_to_fwnode (node),0 ); + parent_domain,of_fwnode_handle (node),0 );if (err <0 )return err;
drivers/irqchip/irq-ls-scfg-msi.c +1 -1
@@ -225,7 +225,7 @@ static int ls_scfg_msi_domains_init(struct ls_scfg_msi *msi_data) } msi_data->msi_domain =pci_msi_create_irq_domain ( -of_node_to_fwnode (msi_data->pdev->dev.of_node), +of_fwnode_handle (msi_data->pdev->dev.of_node), &ls_scfg_msi_domain_info, msi_data->parent);if (!msi_data->msi_domain) {
drivers/irqchip/irq-meson-gpio.c +1 -1
@@ -607,7 +607,7 @@ static int meson_gpio_irq_of_init(struct device_node *node, struct device_node * domain =irq_domain_create_hierarchy (parent_domain,0 , ctl->params->nr_hwirq, -of_node_to_fwnode (node), +of_fwnode_handle (node), &meson_gpio_irq_domain_ops, ctl);if (!domain) {
drivers/irqchip/irq-mvebu-gicp.c +1 -1
@@ -232,7 +232,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev) inner_domain =irq_domain_create_hierarchy (parent_domain,0 , gicp->spi_cnt, -of_node_to_fwnode (node), +of_fwnode_handle (node), &gicp_domain_ops, gicp);if (!inner_domain)return -ENOMEM ;
drivers/irqchip/irq-mvebu-odmi.c +1 -1
@@ -207,7 +207,7 @@ static int __init mvebu_odmi_init(struct device_node *node, inner_domain =irq_domain_create_hierarchy (parent_domain,0 , odmis_count *NODMIS_PER_FRAME , -of_node_to_fwnode (node), +of_fwnode_handle (node), &odmi_domain_ops,NULL );if (!inner_domain) { ret = -ENOMEM ;
drivers/irqchip/irq-mvebu-sei.c +3 -3
@@ -402,7 +402,7 @@ static int mvebu_sei_probe(struct platform_device *pdev) }/* Create the root SEI domain */ - sei->sei_domain = irq_domain_create_linear(of_node_to_fwnode(node), + sei->sei_domain = irq_domain_create_linear(of_fwnode_handle(node), (sei->caps->ap_range.size + sei->caps->cp_range.size), &mvebu_sei_domain_ops,
@@ -418,7 +418,7 @@ static int mvebu_sei_probe(struct platform_device *pdev)/* Create the 'wired' domain */ sei->ap_domain =irq_domain_create_hierarchy (sei->sei_domain,0 , sei->caps->ap_range.size, -of_node_to_fwnode (node), +of_fwnode_handle (node), &mvebu_sei_ap_domain_ops, sei);if (!sei->ap_domain) {
@@ -432,7 +432,7 @@ static int mvebu_sei_probe(struct platform_device *pdev)/* Create the 'MSI' domain */ sei->cp_domain =irq_domain_create_hierarchy (sei->sei_domain,0 , sei->caps->cp_range.size, -of_node_to_fwnode (node), +of_fwnode_handle (node), &mvebu_sei_cp_domain_ops, sei);if (!sei->cp_domain) {
drivers/irqchip/irq-qcom-mpm.c +1 -1
@@ -447,7 +447,7 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent) priv->domain =irq_domain_create_hierarchy (parent_domain,IRQ_DOMAIN_FLAG_QCOM_MPM_WAKEUP , pin_cnt, -of_node_to_fwnode (np), &qcom_mpm_ops, priv); +of_fwnode_handle (np), &qcom_mpm_ops, priv);if (!priv->domain) {dev_err (dev,"failed to create MPM domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-riscv-intc.c +1 -1
@@ -242,7 +242,7 @@ static int __init riscv_intc_init(struct device_node *node, chip = &andes_intc_chip; } -return riscv_intc_init_common (of_node_to_fwnode (node), chip); +return riscv_intc_init_common (of_fwnode_handle (node), chip); }IRQCHIP_DECLARE (riscv,"riscv,cpu-intc" , riscv_intc_init);
drivers/irqchip/irq-sni-exiu.c +1 -1
@@ -249,7 +249,7 @@ static int __init exiu_dt_init(struct device_node *node,return -ENXIO ; } - data =exiu_init (of_node_to_fwnode (node), &res); + data =exiu_init (of_fwnode_handle (node), &res);if (IS_ERR (data))return PTR_ERR (data);
drivers/irqchip/irq-stm32mp-exti.c +1 -1
@@ -531,7 +531,7 @@ static int stm32mp_exti_domain_alloc(struct irq_domain *dm,if (ret)return ret;/* we only support one parent, so far */ -if (of_node_to_fwnode (out_irq.np) != dm->parent->fwnode) +if (of_fwnode_handle (out_irq.np) != dm->parent->fwnode)return -EINVAL ; of_phandle_args_to_fwspec(out_irq.np, out_irq.args,
drivers/irqchip/irq-ti-sci-inta.c +2 -2
@@ -233,7 +233,7 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_domINIT_LIST_HEAD (&vint_desc->list); parent_node =of_irq_find_parent (dev_of_node (&inta->pdev->dev)); - parent_fwspec.fwnode =of_node_to_fwnode (parent_node); + parent_fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */
@@ -709,7 +709,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)return -ENOMEM ; } - msi_domain =ti_sci_inta_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =ti_sci_inta_msi_create_irq_domain (of_fwnode_handle (node), &ti_sci_inta_msi_domain_info, domain);if (!msi_domain) {
drivers/irqchip/irq-ti-sci-intr.c +1 -1
@@ -149,7 +149,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain, goto err_irqs; parent_node =of_irq_find_parent (dev_of_node (intr->dev)); - fwspec.fwnode =of_node_to_fwnode (parent_node); + fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */
drivers/irqchip/irq-uniphier-aidet.c +1 -1
@@ -188,7 +188,7 @@ static int uniphier_aidet_probe(struct platform_device *pdev) priv->domain =irq_domain_create_hierarchy ( parent_domain,0 ,UNIPHIER_AIDET_NR_IRQS , -of_node_to_fwnode (dev->of_node), +of_fwnode_handle (dev->of_node), &uniphier_aidet_domain_ops, priv);if (!priv->domain)return -ENOMEM ;
Signature · 1 line
2.49.0
Re: [Linux-stm32] [PATCH v2 06/57] irqdomain: irqchip: Switch to of_fwnode_handle()
Quoted 4 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
... snip ...
drivers/irqchip/irq-stm32mp-exti.c static int stm32mp_exti_domain_alloc(struct irq_domain *dm, · line 535
Quoted 11 lines
drivers/irqchip/irq-stm32mp-exti.c +1
-1@@ -531,7 +531,7 @@ static int stm32mp_exti_domain_alloc(struct irq_domain *dm, if (ret) return ret; /* we only support one parent, so far */ - if (of_node_to_fwnode(out_irq.np) != dm->parent->fwnode) + if (of_fwnode_handle(out_irq.np) != dm->parent->fwnode)
For drivers/irqchip/irq-stm32mp-exti.c
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v2 06/57] irqdomain: irqchip: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)Quoted 35 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Antoine Tenart <[email protected]>Cc Sven Peter <[email protected]>Cc Janne Grunau <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Cc Andrew Lunn <[email protected]>Cc Gregory Clement <[email protected]>Cc Sebastian Hesselbarth <[email protected]>Cc Marc Zyngier <[email protected]>Cc Linus Walleij <[email protected]>Cc Imre Kaloz <[email protected]>Cc Herve Codina <[email protected]>Cc Huacai Chen <[email protected]>Cc WANG Xuerui <[email protected]>Cc Jiaxun Yang <[email protected]>Cc Neil Armstrong <[email protected]>Cc Kevin Hilman <[email protected]>Cc Jerome Brunet <[email protected]>Cc Martin Blumenstingl <[email protected]>Cc Anup Patel <[email protected]>Cc Paul Walmsley <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>Cc Alexandre Ghiti <[email protected]>Cc Maxime Coquelin <[email protected]>Cc Alexandre Torgue <[email protected]>Cc Nishanth Menon <[email protected]>Cc Tero Kristo <[email protected]>Cc Santosh Shilimkar <[email protected]>Cc Kunihiko Hayashi <[email protected]>
Quoted 8 lines
Cc Masami Hiramatsu <[email protected]>
LGTM for irq-riscv-intc driver
Regards,
Anup
Quoted 410 lines
--- drivers/irqchip/irq-alpine-msi.c | 2 +- drivers/irqchip/irq-apple-aic.c | 4 ++-- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/irqchip/irq-gic-v3.c | 4 ++-- drivers/irqchip/irq-ixp4xx.c | 2 +- drivers/irqchip/irq-lan966x-oic.c | 2 +- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 2 +- drivers/irqchip/irq-loongson-htvec.c | 2 +- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- drivers/irqchip/irq-ls-scfg-msi.c | 2 +- drivers/irqchip/irq-meson-gpio.c | 2 +- drivers/irqchip/irq-mvebu-gicp.c | 2 +- drivers/irqchip/irq-mvebu-odmi.c | 2 +- drivers/irqchip/irq-mvebu-sei.c | 6 +++--- drivers/irqchip/irq-qcom-mpm.c | 2 +- drivers/irqchip/irq-riscv-intc.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 2 +- drivers/irqchip/irq-stm32mp-exti.c | 2 +- drivers/irqchip/irq-ti-sci-inta.c | 4 ++-- drivers/irqchip/irq-ti-sci-intr.c | 2 +- drivers/irqchip/irq-uniphier-aidet.c | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-)drivers/irqchip/irq-alpine-msi.c +1
-1@@ -213,7 +213,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENOMEM ; } - msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &alpine_msix_domain_info, middle_domain);if (!msi_domain) {drivers/irqchip/irq-apple-aic.c +2
-2@@ -1014,7 +1014,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p irqc->info.die_stride = off - start_off; - irqc->hw_domain =irq_domain_create_tree (of_node_to_fwnode (node), + irqc->hw_domain =irq_domain_create_tree (of_fwnode_handle (node), &aic_irq_domain_ops, irqc);if (WARN_ON (!irqc->hw_domain)) goto err_unmap;@@ -1067,7 +1067,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *pif (is_kernel_in_hyp_mode ()) {struct irq_fwspec mi = { - .fwnode =of_node_to_fwnode (node), + .fwnode =of_fwnode_handle (node), .param_count =3 , .param = { [0 ] =AIC_FIQ ,/* This is a lie */ drivers/irqchip/irq-armada-370-xp.c +2
-2@@ -353,7 +353,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,if (!mpic->msi_inner_domain)return -ENOMEM ; - mpic->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), &mpic_msi_domain_info, + mpic->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &mpic_msi_domain_info, mpic->msi_inner_domain);if (!mpic->msi_domain) {irq_domain_remove (mpic->msi_inner_domain);@@ -492,7 +492,7 @@ static int __init mpic_ipi_init(struct mpic *mpic, struct device_node *node) {int base_ipi; - mpic->ipi_domain =irq_domain_create_linear (of_node_to_fwnode (node),IPI_DOORBELL_NR , + mpic->ipi_domain =irq_domain_create_linear (of_fwnode_handle (node),IPI_DOORBELL_NR , &mpic_ipi_domain_ops, mpic);if (WARN_ON (!mpic->ipi_domain))return -ENOMEM ;drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +1
-1@@ -152,7 +152,7 @@ static void __init its_fsl_mc_of_msi_init(void)if (!of_property_read_bool (np,"msi-controller" ))continue ; -its_fsl_mc_msi_init_one (of_node_to_fwnode (np), +its_fsl_mc_msi_init_one (of_fwnode_handle (np), np->full_name); } }drivers/irqchip/irq-gic-v3.c +2
-2@@ -1826,7 +1826,7 @@ static int partition_domain_translate(struct irq_domain *d, ppi_idx =__gic_get_ppi_index (ppi_intid); ret =partition_translate_id (gic_data.ppi_descs[ppi_idx], -of_node_to_fwnode (np)); +of_fwnode_handle (np));if (ret <0 )return ret;@@ -2192,7 +2192,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) part = &parts[part_idx]; - part->partition_id =of_node_to_fwnode (child_part); + part->partition_id =of_fwnode_handle (child_part);pr_info ("GIC: PPI partition %pOFn[%d] { " , child_part, part_idx);drivers/irqchip/irq-ixp4xx.c +1
-1@@ -261,7 +261,7 @@ static int __init ixp4xx_of_init_irq(struct device_node *np,pr_crit ("IXP4XX: could not ioremap interrupt controller\n" );return -ENODEV ; } - fwnode =of_node_to_fwnode (np); + fwnode =of_fwnode_handle (np);/* These chip variants have 64 interrupts */ is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") ||drivers/irqchip/irq-lan966x-oic.c +1
-1@@ -224,7 +224,7 @@ static int lan966x_oic_probe(struct platform_device *pdev) .exit = lan966x_oic_chip_exit, };struct irq_domain_info d_info = { - .fwnode =of_node_to_fwnode (pdev->dev.of_node), + .fwnode =of_fwnode_handle (pdev->dev.of_node), .domain_flags =IRQ_DOMAIN_FLAG_DESTROY_GC , .size =LAN966X_OIC_NR_IRQ , .hwirq_max =LAN966X_OIC_NR_IRQ ,drivers/irqchip/irq-loongarch-cpu.c +1
-1@@ -100,7 +100,7 @@ static const struct irq_domain_ops loongarch_cpu_intc_irq_domain_ops = {static int __init cpuintc_of_init (struct device_node *of_node,struct device_node *parent) { - cpuintc_handle =of_node_to_fwnode (of_node); + cpuintc_handle =of_fwnode_handle (of_node); irq_domain =irq_domain_create_linear (cpuintc_handle,EXCCODE_INT_NUM , &loongarch_cpu_intc_irq_domain_ops,NULL );drivers/irqchip/irq-loongson-eiointc.c +1
-1@@ -554,7 +554,7 @@ static int __init eiointc_of_init(struct device_node *of_node, priv->vec_count =VEC_COUNT ; priv->node =0 ; - priv->domain_handle =of_node_to_fwnode (of_node); + priv->domain_handle =of_fwnode_handle (of_node); ret =eiointc_init (priv, parent_irq,0 );if (ret <0 )drivers/irqchip/irq-loongson-htvec.c +1
-1@@ -248,7 +248,7 @@ static int htvec_of_init(struct device_node *node, } err =htvec_init (res.start,resource_size (&res), - num_parents, parent_irq,of_node_to_fwnode (node)); + num_parents, parent_irq,of_fwnode_handle (node));if (err <0 )return err;drivers/irqchip/irq-loongson-liointc.c +1
-1@@ -363,7 +363,7 @@ static int __init liointc_of_init(struct device_node *node, } err =liointc_init (res.start,resource_size (&res), - revision,of_node_to_fwnode (node), node); + revision,of_fwnode_handle (node), node);if (err <0 )return err;drivers/irqchip/irq-loongson-pch-msi.c +1
-1@@ -243,7 +243,7 @@ static int pch_msi_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_node_to_fwnode (node)); + err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_fwnode_handle (node));if (err <0 )return err;drivers/irqchip/irq-loongson-pch-pic.c +1
-1@@ -392,7 +392,7 @@ static int pch_pic_of_init(struct device_node *node, } err =pch_pic_init (res.start,resource_size (&res), vec_base, - parent_domain,of_node_to_fwnode (node),0 ); + parent_domain,of_fwnode_handle (node),0 );if (err <0 )return err;drivers/irqchip/irq-ls-scfg-msi.c +1
-1@@ -225,7 +225,7 @@ static int ls_scfg_msi_domains_init(struct ls_scfg_msi *msi_data) } msi_data->msi_domain =pci_msi_create_irq_domain ( -of_node_to_fwnode (msi_data->pdev->dev.of_node), +of_fwnode_handle (msi_data->pdev->dev.of_node), &ls_scfg_msi_domain_info, msi_data->parent);if (!msi_data->msi_domain) {drivers/irqchip/irq-meson-gpio.c +1
-1@@ -607,7 +607,7 @@ static int meson_gpio_irq_of_init(struct device_node *node, struct device_node * domain =irq_domain_create_hierarchy (parent_domain,0 , ctl->params->nr_hwirq, -of_node_to_fwnode (node), +of_fwnode_handle (node), &meson_gpio_irq_domain_ops, ctl);if (!domain) {drivers/irqchip/irq-mvebu-gicp.c +1
-1@@ -232,7 +232,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev) inner_domain =irq_domain_create_hierarchy (parent_domain,0 , gicp->spi_cnt, -of_node_to_fwnode (node), +of_fwnode_handle (node), &gicp_domain_ops, gicp);if (!inner_domain)return -ENOMEM ;drivers/irqchip/irq-mvebu-odmi.c +1
-1@@ -207,7 +207,7 @@ static int __init mvebu_odmi_init(struct device_node *node, inner_domain =irq_domain_create_hierarchy (parent_domain,0 , odmis_count *NODMIS_PER_FRAME , -of_node_to_fwnode (node), +of_fwnode_handle (node), &odmi_domain_ops,NULL );if (!inner_domain) { ret = -ENOMEM ;drivers/irqchip/irq-mvebu-sei.c +3
-3@@ -402,7 +402,7 @@ static int mvebu_sei_probe(struct platform_device *pdev) }/* Create the root SEI domain */ - sei->sei_domain = irq_domain_create_linear(of_node_to_fwnode(node), + sei->sei_domain = irq_domain_create_linear(of_fwnode_handle(node), (sei->caps->ap_range.size + sei->caps->cp_range.size), &mvebu_sei_domain_ops,@@ -418,7 +418,7 @@ static int mvebu_sei_probe(struct platform_device *pdev)/* Create the 'wired' domain */ sei->ap_domain =irq_domain_create_hierarchy (sei->sei_domain,0 , sei->caps->ap_range.size, -of_node_to_fwnode (node), +of_fwnode_handle (node), &mvebu_sei_ap_domain_ops, sei);if (!sei->ap_domain) {@@ -432,7 +432,7 @@ static int mvebu_sei_probe(struct platform_device *pdev)/* Create the 'MSI' domain */ sei->cp_domain =irq_domain_create_hierarchy (sei->sei_domain,0 , sei->caps->cp_range.size, -of_node_to_fwnode (node), +of_fwnode_handle (node), &mvebu_sei_cp_domain_ops, sei);if (!sei->cp_domain) {drivers/irqchip/irq-qcom-mpm.c +1
-1@@ -447,7 +447,7 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent) priv->domain =irq_domain_create_hierarchy (parent_domain,IRQ_DOMAIN_FLAG_QCOM_MPM_WAKEUP , pin_cnt, -of_node_to_fwnode (np), &qcom_mpm_ops, priv); +of_fwnode_handle (np), &qcom_mpm_ops, priv);if (!priv->domain) {dev_err (dev,"failed to create MPM domain\n" ); ret = -ENOMEM ;drivers/irqchip/irq-riscv-intc.c +1
-1@@ -242,7 +242,7 @@ static int __init riscv_intc_init(struct device_node *node, chip = &andes_intc_chip; } -return riscv_intc_init_common (of_node_to_fwnode (node), chip); +return riscv_intc_init_common (of_fwnode_handle (node), chip); }IRQCHIP_DECLARE (riscv,"riscv,cpu-intc" , riscv_intc_init);drivers/irqchip/irq-sni-exiu.c +1
-1@@ -249,7 +249,7 @@ static int __init exiu_dt_init(struct device_node *node,return -ENXIO ; } - data =exiu_init (of_node_to_fwnode (node), &res); + data =exiu_init (of_fwnode_handle (node), &res);if (IS_ERR (data))return PTR_ERR (data);drivers/irqchip/irq-stm32mp-exti.c +1
-1@@ -531,7 +531,7 @@ static int stm32mp_exti_domain_alloc(struct irq_domain *dm,if (ret)return ret;/* we only support one parent, so far */ -if (of_node_to_fwnode (out_irq.np) != dm->parent->fwnode) +if (of_fwnode_handle (out_irq.np) != dm->parent->fwnode)return -EINVAL ; of_phandle_args_to_fwspec(out_irq.np, out_irq.args,drivers/irqchip/irq-ti-sci-inta.c +2
-2@@ -233,7 +233,7 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_domINIT_LIST_HEAD (&vint_desc->list); parent_node =of_irq_find_parent (dev_of_node (&inta->pdev->dev)); - parent_fwspec.fwnode =of_node_to_fwnode (parent_node); + parent_fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */ @@ -709,7 +709,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)return -ENOMEM ; } - msi_domain =ti_sci_inta_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =ti_sci_inta_msi_create_irq_domain (of_fwnode_handle (node), &ti_sci_inta_msi_domain_info, domain);if (!msi_domain) {drivers/irqchip/irq-ti-sci-intr.c +1
-1@@ -149,7 +149,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain, goto err_irqs; parent_node =of_irq_find_parent (dev_of_node (intr->dev)); - fwspec.fwnode =of_node_to_fwnode (parent_node); + fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */ drivers/irqchip/irq-uniphier-aidet.c +1
-2@@ -188,7 +188,7 @@ static int uniphier_aidet_probe(struct platform_device *pdev) priv->domain =irq_domain_create_hierarchy ( parent_domain,0 ,UNIPHIER_AIDET_NR_IRQS , -of_node_to_fwnode (dev->of_node), +of_fwnode_handle (dev->of_node), &uniphier_aidet_domain_ops, priv);if (!priv->domain)return -ENOMEM ; --2.49.0
Re: [PATCH v2 06/57] irqdomain: irqchip: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)Hi Jiri,
Quoted 5 lines · On Wed, 19 Mar 2025 10:28:59 +0100 "Jiri Slaby (SUSE)" <[email protected]>…
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.Signed-off-by Jiri Slaby (SUSE) <[email protected]>
Best regards,
Hervé
[tip: irq/cleanups] irqchip: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 0d646609ddee42b5be164ee39992f764edd3de40 Gitweb: https://git.kernel.org/tip/0d646609ddee42b5be164ee39992f764edd3de40 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:59 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:03 +02:00
irqchip: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- drivers/irqchip/irq-alpine-msi.c | 2 +- drivers/irqchip/irq-apple-aic.c | 4 ++-- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/irqchip/irq-gic-v3.c | 4 ++-- drivers/irqchip/irq-ixp4xx.c | 2 +- drivers/irqchip/irq-lan966x-oic.c | 2 +- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 2 +- drivers/irqchip/irq-loongson-htvec.c | 2 +- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- drivers/irqchip/irq-ls-scfg-msi.c | 2 +- drivers/irqchip/irq-meson-gpio.c | 2 +- drivers/irqchip/irq-mvebu-gicp.c | 2 +- drivers/irqchip/irq-mvebu-odmi.c | 2 +- drivers/irqchip/irq-mvebu-sei.c | 6 +++--- drivers/irqchip/irq-qcom-mpm.c | 2 +- drivers/irqchip/irq-riscv-intc.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 2 +- drivers/irqchip/irq-stm32mp-exti.c | 2 +- drivers/irqchip/irq-ti-sci-inta.c | 4 ++-- drivers/irqchip/irq-ti-sci-intr.c | 2 +- drivers/irqchip/irq-uniphier-aidet.c | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-)
drivers/irqchip/irq-alpine-msi.c +1 -1
@@ -213,7 +213,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENOMEM ; } - msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &alpine_msix_domain_info, middle_domain);if (!msi_domain) {
drivers/irqchip/irq-apple-aic.c +2 -2
@@ -1014,7 +1014,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p irqc->info.die_stride = off - start_off; - irqc->hw_domain =irq_domain_create_tree (of_node_to_fwnode (node), + irqc->hw_domain =irq_domain_create_tree (of_fwnode_handle (node), &aic_irq_domain_ops, irqc);if (WARN_ON (!irqc->hw_domain)) goto err_unmap;
@@ -1067,7 +1067,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *pif (is_kernel_in_hyp_mode ()) {struct irq_fwspec mi = { - .fwnode =of_node_to_fwnode (node), + .fwnode =of_fwnode_handle (node), .param_count =3 , .param = { [0 ] =AIC_FIQ ,/* This is a lie */
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -353,7 +353,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,if (!mpic->msi_inner_domain)return -ENOMEM ; - mpic->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), &mpic_msi_domain_info, + mpic->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &mpic_msi_domain_info, mpic->msi_inner_domain);if (!mpic->msi_domain) {irq_domain_remove (mpic->msi_inner_domain);
@@ -492,7 +492,7 @@ static int __init mpic_ipi_init(struct mpic *mpic, struct device_node *node) {int base_ipi; - mpic->ipi_domain =irq_domain_create_linear (of_node_to_fwnode (node),IPI_DOORBELL_NR , + mpic->ipi_domain =irq_domain_create_linear (of_fwnode_handle (node),IPI_DOORBELL_NR , &mpic_ipi_domain_ops, mpic);if (WARN_ON (!mpic->ipi_domain))return -ENOMEM ;
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +1 -1
@@ -152,7 +152,7 @@ static void __init its_fsl_mc_of_msi_init(void)if (!of_property_read_bool (np,"msi-controller" ))continue ; -its_fsl_mc_msi_init_one (of_node_to_fwnode (np), +its_fsl_mc_msi_init_one (of_fwnode_handle (np), np->full_name); } }
drivers/irqchip/irq-gic-v3.c +2 -2
@@ -1826,7 +1826,7 @@ static int partition_domain_translate(struct irq_domain *d, ppi_idx =__gic_get_ppi_index (ppi_intid); ret =partition_translate_id (gic_data.ppi_descs[ppi_idx], -of_node_to_fwnode (np)); +of_fwnode_handle (np));if (ret <0 )return ret;
@@ -2192,7 +2192,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) part = &parts[part_idx]; - part->partition_id =of_node_to_fwnode (child_part); + part->partition_id =of_fwnode_handle (child_part);pr_info ("GIC: PPI partition %pOFn[%d] { " , child_part, part_idx);
drivers/irqchip/irq-ixp4xx.c +1 -1
@@ -261,7 +261,7 @@ static int __init ixp4xx_of_init_irq(struct device_node *np,pr_crit ("IXP4XX: could not ioremap interrupt controller\n" );return -ENODEV ; } - fwnode =of_node_to_fwnode (np); + fwnode =of_fwnode_handle (np);/* These chip variants have 64 interrupts */ is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") ||
drivers/irqchip/irq-lan966x-oic.c +1 -1
@@ -224,7 +224,7 @@ static int lan966x_oic_probe(struct platform_device *pdev) .exit = lan966x_oic_chip_exit, };struct irq_domain_info d_info = { - .fwnode =of_node_to_fwnode (pdev->dev.of_node), + .fwnode =of_fwnode_handle (pdev->dev.of_node), .domain_flags =IRQ_DOMAIN_FLAG_DESTROY_GC , .size =LAN966X_OIC_NR_IRQ , .hwirq_max =LAN966X_OIC_NR_IRQ ,
drivers/irqchip/irq-loongarch-cpu.c +1 -1
@@ -100,7 +100,7 @@ static const struct irq_domain_ops loongarch_cpu_intc_irq_domain_ops = {static int __init cpuintc_of_init (struct device_node *of_node,struct device_node *parent) { - cpuintc_handle =of_node_to_fwnode (of_node); + cpuintc_handle =of_fwnode_handle (of_node); irq_domain =irq_domain_create_linear (cpuintc_handle,EXCCODE_INT_NUM , &loongarch_cpu_intc_irq_domain_ops,NULL );
drivers/irqchip/irq-loongson-eiointc.c +1 -1
@@ -554,7 +554,7 @@ static int __init eiointc_of_init(struct device_node *of_node, priv->vec_count =VEC_COUNT ; priv->node =0 ; - priv->domain_handle =of_node_to_fwnode (of_node); + priv->domain_handle =of_fwnode_handle (of_node); ret =eiointc_init (priv, parent_irq,0 );if (ret <0 )
drivers/irqchip/irq-loongson-htvec.c +1 -1
@@ -248,7 +248,7 @@ static int htvec_of_init(struct device_node *node, } err =htvec_init (res.start,resource_size (&res), - num_parents, parent_irq,of_node_to_fwnode (node)); + num_parents, parent_irq,of_fwnode_handle (node));if (err <0 )return err;
drivers/irqchip/irq-loongson-liointc.c +1 -1
@@ -363,7 +363,7 @@ static int __init liointc_of_init(struct device_node *node, } err =liointc_init (res.start,resource_size (&res), - revision,of_node_to_fwnode (node), node); + revision,of_fwnode_handle (node), node);if (err <0 )return err;
drivers/irqchip/irq-loongson-pch-msi.c +1 -1
@@ -243,7 +243,7 @@ static int pch_msi_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_node_to_fwnode (node)); + err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_fwnode_handle (node));if (err <0 )return err;
drivers/irqchip/irq-loongson-pch-pic.c +1 -1
@@ -392,7 +392,7 @@ static int pch_pic_of_init(struct device_node *node, } err =pch_pic_init (res.start,resource_size (&res), vec_base, - parent_domain,of_node_to_fwnode (node),0 ); + parent_domain,of_fwnode_handle (node),0 );if (err <0 )return err;
drivers/irqchip/irq-ls-scfg-msi.c +1 -1
@@ -225,7 +225,7 @@ static int ls_scfg_msi_domains_init(struct ls_scfg_msi *msi_data) } msi_data->msi_domain =pci_msi_create_irq_domain ( -of_node_to_fwnode (msi_data->pdev->dev.of_node), +of_fwnode_handle (msi_data->pdev->dev.of_node), &ls_scfg_msi_domain_info, msi_data->parent);if (!msi_data->msi_domain) {
drivers/irqchip/irq-meson-gpio.c +1 -1
@@ -607,7 +607,7 @@ static int meson_gpio_irq_of_init(struct device_node *node, struct device_node * domain =irq_domain_create_hierarchy (parent_domain,0 , ctl->params->nr_hwirq, -of_node_to_fwnode (node), +of_fwnode_handle (node), &meson_gpio_irq_domain_ops, ctl);if (!domain) {
drivers/irqchip/irq-mvebu-gicp.c +1 -1
@@ -232,7 +232,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev) inner_domain =irq_domain_create_hierarchy (parent_domain,0 , gicp->spi_cnt, -of_node_to_fwnode (node), +of_fwnode_handle (node), &gicp_domain_ops, gicp);if (!inner_domain)return -ENOMEM ;
drivers/irqchip/irq-mvebu-odmi.c +1 -1
@@ -207,7 +207,7 @@ static int __init mvebu_odmi_init(struct device_node *node, inner_domain =irq_domain_create_hierarchy (parent_domain,0 , odmis_count *NODMIS_PER_FRAME , -of_node_to_fwnode (node), +of_fwnode_handle (node), &odmi_domain_ops,NULL );if (!inner_domain) { ret = -ENOMEM ;
drivers/irqchip/irq-mvebu-sei.c +3 -3
@@ -402,7 +402,7 @@ static int mvebu_sei_probe(struct platform_device *pdev) }/* Create the root SEI domain */ - sei->sei_domain = irq_domain_create_linear(of_node_to_fwnode(node), + sei->sei_domain = irq_domain_create_linear(of_fwnode_handle(node), (sei->caps->ap_range.size + sei->caps->cp_range.size), &mvebu_sei_domain_ops,
@@ -418,7 +418,7 @@ static int mvebu_sei_probe(struct platform_device *pdev)/* Create the 'wired' domain */ sei->ap_domain =irq_domain_create_hierarchy (sei->sei_domain,0 , sei->caps->ap_range.size, -of_node_to_fwnode (node), +of_fwnode_handle (node), &mvebu_sei_ap_domain_ops, sei);if (!sei->ap_domain) {
@@ -432,7 +432,7 @@ static int mvebu_sei_probe(struct platform_device *pdev)/* Create the 'MSI' domain */ sei->cp_domain =irq_domain_create_hierarchy (sei->sei_domain,0 , sei->caps->cp_range.size, -of_node_to_fwnode (node), +of_fwnode_handle (node), &mvebu_sei_cp_domain_ops, sei);if (!sei->cp_domain) {
drivers/irqchip/irq-qcom-mpm.c +1 -1
@@ -447,7 +447,7 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent) priv->domain =irq_domain_create_hierarchy (parent_domain,IRQ_DOMAIN_FLAG_QCOM_MPM_WAKEUP , pin_cnt, -of_node_to_fwnode (np), &qcom_mpm_ops, priv); +of_fwnode_handle (np), &qcom_mpm_ops, priv);if (!priv->domain) {dev_err (dev,"failed to create MPM domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-riscv-intc.c +1 -1
@@ -242,7 +242,7 @@ static int __init riscv_intc_init(struct device_node *node, chip = &andes_intc_chip; } -return riscv_intc_init_common (of_node_to_fwnode (node), chip); +return riscv_intc_init_common (of_fwnode_handle (node), chip); }IRQCHIP_DECLARE (riscv,"riscv,cpu-intc" , riscv_intc_init);
drivers/irqchip/irq-sni-exiu.c +1 -1
@@ -249,7 +249,7 @@ static int __init exiu_dt_init(struct device_node *node,return -ENXIO ; } - data =exiu_init (of_node_to_fwnode (node), &res); + data =exiu_init (of_fwnode_handle (node), &res);if (IS_ERR (data))return PTR_ERR (data);
drivers/irqchip/irq-stm32mp-exti.c +1 -1
@@ -531,7 +531,7 @@ static int stm32mp_exti_domain_alloc(struct irq_domain *dm,if (ret)return ret;/* we only support one parent, so far */ -if (of_node_to_fwnode (out_irq.np) != dm->parent->fwnode) +if (of_fwnode_handle (out_irq.np) != dm->parent->fwnode)return -EINVAL ; of_phandle_args_to_fwspec(out_irq.np, out_irq.args,
drivers/irqchip/irq-ti-sci-inta.c +2 -2
@@ -233,7 +233,7 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_domINIT_LIST_HEAD (&vint_desc->list); parent_node =of_irq_find_parent (dev_of_node (&inta->pdev->dev)); - parent_fwspec.fwnode =of_node_to_fwnode (parent_node); + parent_fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */
@@ -709,7 +709,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)return -ENOMEM ; } - msi_domain =ti_sci_inta_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =ti_sci_inta_msi_create_irq_domain (of_fwnode_handle (node), &ti_sci_inta_msi_domain_info, domain);if (!msi_domain) {
drivers/irqchip/irq-ti-sci-intr.c +1 -1
@@ -149,7 +149,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain, goto err_irqs; parent_node =of_irq_find_parent (dev_of_node (intr->dev)); - fwspec.fwnode =of_node_to_fwnode (parent_node); + fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */
drivers/irqchip/irq-uniphier-aidet.c +1 -1
@@ -188,7 +188,7 @@ static int uniphier_aidet_probe(struct platform_device *pdev) priv->domain =irq_domain_create_hierarchy ( parent_domain,0 ,UNIPHIER_AIDET_NR_IRQS , -of_node_to_fwnode (dev->of_node), +of_fwnode_handle (dev->of_node), &uniphier_aidet_domain_ops, priv);if (!priv->domain)return -ENOMEM ;
[tip: irq/cleanups] irqchip: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 1e5b6bfd7f5790952798781dfabc968e9d8116fb Gitweb: https://git.kernel.org/tip/1e5b6bfd7f5790952798781dfabc968e9d8116fb Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:59 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:21 +02:00
irqchip: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- drivers/irqchip/irq-alpine-msi.c | 2 +- drivers/irqchip/irq-apple-aic.c | 4 ++-- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/irqchip/irq-gic-v3.c | 4 ++-- drivers/irqchip/irq-ixp4xx.c | 2 +- drivers/irqchip/irq-lan966x-oic.c | 2 +- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 2 +- drivers/irqchip/irq-loongson-htvec.c | 2 +- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- drivers/irqchip/irq-ls-scfg-msi.c | 2 +- drivers/irqchip/irq-meson-gpio.c | 2 +- drivers/irqchip/irq-mvebu-gicp.c | 2 +- drivers/irqchip/irq-mvebu-odmi.c | 2 +- drivers/irqchip/irq-mvebu-sei.c | 6 +++--- drivers/irqchip/irq-qcom-mpm.c | 2 +- drivers/irqchip/irq-riscv-intc.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 2 +- drivers/irqchip/irq-stm32mp-exti.c | 2 +- drivers/irqchip/irq-ti-sci-inta.c | 4 ++-- drivers/irqchip/irq-ti-sci-intr.c | 2 +- drivers/irqchip/irq-uniphier-aidet.c | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-)
drivers/irqchip/irq-alpine-msi.c +1 -1
@@ -213,7 +213,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENOMEM ; } - msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &alpine_msix_domain_info, middle_domain);if (!msi_domain) {
drivers/irqchip/irq-apple-aic.c +2 -2
@@ -1014,7 +1014,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p irqc->info.die_stride = off - start_off; - irqc->hw_domain =irq_domain_create_tree (of_node_to_fwnode (node), + irqc->hw_domain =irq_domain_create_tree (of_fwnode_handle (node), &aic_irq_domain_ops, irqc);if (WARN_ON (!irqc->hw_domain)) goto err_unmap;
@@ -1067,7 +1067,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *pif (is_kernel_in_hyp_mode ()) {struct irq_fwspec mi = { - .fwnode =of_node_to_fwnode (node), + .fwnode =of_fwnode_handle (node), .param_count =3 , .param = { [0 ] =AIC_FIQ ,/* This is a lie */
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -353,7 +353,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,if (!mpic->msi_inner_domain)return -ENOMEM ; - mpic->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), &mpic_msi_domain_info, + mpic->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &mpic_msi_domain_info, mpic->msi_inner_domain);if (!mpic->msi_domain) {irq_domain_remove (mpic->msi_inner_domain);
@@ -492,7 +492,7 @@ static int __init mpic_ipi_init(struct mpic *mpic, struct device_node *node) {int base_ipi; - mpic->ipi_domain =irq_domain_create_linear (of_node_to_fwnode (node),IPI_DOORBELL_NR , + mpic->ipi_domain =irq_domain_create_linear (of_fwnode_handle (node),IPI_DOORBELL_NR , &mpic_ipi_domain_ops, mpic);if (WARN_ON (!mpic->ipi_domain))return -ENOMEM ;
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +1 -1
@@ -152,7 +152,7 @@ static void __init its_fsl_mc_of_msi_init(void)if (!of_property_read_bool (np,"msi-controller" ))continue ; -its_fsl_mc_msi_init_one (of_node_to_fwnode (np), +its_fsl_mc_msi_init_one (of_fwnode_handle (np), np->full_name); } }
drivers/irqchip/irq-gic-v3.c +2 -2
@@ -1826,7 +1826,7 @@ static int partition_domain_translate(struct irq_domain *d, ppi_idx =__gic_get_ppi_index (ppi_intid); ret =partition_translate_id (gic_data.ppi_descs[ppi_idx], -of_node_to_fwnode (np)); +of_fwnode_handle (np));if (ret <0 )return ret;
@@ -2192,7 +2192,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) part = &parts[part_idx]; - part->partition_id =of_node_to_fwnode (child_part); + part->partition_id =of_fwnode_handle (child_part);pr_info ("GIC: PPI partition %pOFn[%d] { " , child_part, part_idx);
drivers/irqchip/irq-ixp4xx.c +1 -1
@@ -261,7 +261,7 @@ static int __init ixp4xx_of_init_irq(struct device_node *np,pr_crit ("IXP4XX: could not ioremap interrupt controller\n" );return -ENODEV ; } - fwnode =of_node_to_fwnode (np); + fwnode =of_fwnode_handle (np);/* These chip variants have 64 interrupts */ is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") ||
drivers/irqchip/irq-lan966x-oic.c +1 -1
@@ -224,7 +224,7 @@ static int lan966x_oic_probe(struct platform_device *pdev) .exit = lan966x_oic_chip_exit, };struct irq_domain_info d_info = { - .fwnode =of_node_to_fwnode (pdev->dev.of_node), + .fwnode =of_fwnode_handle (pdev->dev.of_node), .domain_flags =IRQ_DOMAIN_FLAG_DESTROY_GC , .size =LAN966X_OIC_NR_IRQ , .hwirq_max =LAN966X_OIC_NR_IRQ ,
drivers/irqchip/irq-loongarch-cpu.c +1 -1
@@ -100,7 +100,7 @@ static const struct irq_domain_ops loongarch_cpu_intc_irq_domain_ops = {static int __init cpuintc_of_init (struct device_node *of_node,struct device_node *parent) { - cpuintc_handle =of_node_to_fwnode (of_node); + cpuintc_handle =of_fwnode_handle (of_node); irq_domain =irq_domain_create_linear (cpuintc_handle,EXCCODE_INT_NUM , &loongarch_cpu_intc_irq_domain_ops,NULL );
drivers/irqchip/irq-loongson-eiointc.c +1 -1
@@ -554,7 +554,7 @@ static int __init eiointc_of_init(struct device_node *of_node, priv->vec_count =VEC_COUNT ; priv->node =0 ; - priv->domain_handle =of_node_to_fwnode (of_node); + priv->domain_handle =of_fwnode_handle (of_node); ret =eiointc_init (priv, parent_irq,0 );if (ret <0 )
drivers/irqchip/irq-loongson-htvec.c +1 -1
@@ -248,7 +248,7 @@ static int htvec_of_init(struct device_node *node, } err =htvec_init (res.start,resource_size (&res), - num_parents, parent_irq,of_node_to_fwnode (node)); + num_parents, parent_irq,of_fwnode_handle (node));if (err <0 )return err;
drivers/irqchip/irq-loongson-liointc.c +1 -1
@@ -363,7 +363,7 @@ static int __init liointc_of_init(struct device_node *node, } err =liointc_init (res.start,resource_size (&res), - revision,of_node_to_fwnode (node), node); + revision,of_fwnode_handle (node), node);if (err <0 )return err;
drivers/irqchip/irq-loongson-pch-msi.c +1 -1
@@ -243,7 +243,7 @@ static int pch_msi_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_node_to_fwnode (node)); + err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_fwnode_handle (node));if (err <0 )return err;
drivers/irqchip/irq-loongson-pch-pic.c +1 -1
@@ -392,7 +392,7 @@ static int pch_pic_of_init(struct device_node *node, } err =pch_pic_init (res.start,resource_size (&res), vec_base, - parent_domain,of_node_to_fwnode (node),0 ); + parent_domain,of_fwnode_handle (node),0 );if (err <0 )return err;
drivers/irqchip/irq-ls-scfg-msi.c +1 -1
@@ -225,7 +225,7 @@ static int ls_scfg_msi_domains_init(struct ls_scfg_msi *msi_data) } msi_data->msi_domain =pci_msi_create_irq_domain ( -of_node_to_fwnode (msi_data->pdev->dev.of_node), +of_fwnode_handle (msi_data->pdev->dev.of_node), &ls_scfg_msi_domain_info, msi_data->parent);if (!msi_data->msi_domain) {
drivers/irqchip/irq-meson-gpio.c +1 -1
@@ -607,7 +607,7 @@ static int meson_gpio_irq_of_init(struct device_node *node, struct device_node * domain =irq_domain_create_hierarchy (parent_domain,0 , ctl->params->nr_hwirq, -of_node_to_fwnode (node), +of_fwnode_handle (node), &meson_gpio_irq_domain_ops, ctl);if (!domain) {
drivers/irqchip/irq-mvebu-gicp.c +1 -1
@@ -232,7 +232,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev) inner_domain =irq_domain_create_hierarchy (parent_domain,0 , gicp->spi_cnt, -of_node_to_fwnode (node), +of_fwnode_handle (node), &gicp_domain_ops, gicp);if (!inner_domain)return -ENOMEM ;
drivers/irqchip/irq-mvebu-odmi.c +1 -1
@@ -207,7 +207,7 @@ static int __init mvebu_odmi_init(struct device_node *node, inner_domain =irq_domain_create_hierarchy (parent_domain,0 , odmis_count *NODMIS_PER_FRAME , -of_node_to_fwnode (node), +of_fwnode_handle (node), &odmi_domain_ops,NULL );if (!inner_domain) { ret = -ENOMEM ;
drivers/irqchip/irq-mvebu-sei.c +3 -3
@@ -402,7 +402,7 @@ static int mvebu_sei_probe(struct platform_device *pdev) }/* Create the root SEI domain */ - sei->sei_domain = irq_domain_create_linear(of_node_to_fwnode(node), + sei->sei_domain = irq_domain_create_linear(of_fwnode_handle(node), (sei->caps->ap_range.size + sei->caps->cp_range.size), &mvebu_sei_domain_ops,
@@ -418,7 +418,7 @@ static int mvebu_sei_probe(struct platform_device *pdev)/* Create the 'wired' domain */ sei->ap_domain =irq_domain_create_hierarchy (sei->sei_domain,0 , sei->caps->ap_range.size, -of_node_to_fwnode (node), +of_fwnode_handle (node), &mvebu_sei_ap_domain_ops, sei);if (!sei->ap_domain) {
@@ -432,7 +432,7 @@ static int mvebu_sei_probe(struct platform_device *pdev)/* Create the 'MSI' domain */ sei->cp_domain =irq_domain_create_hierarchy (sei->sei_domain,0 , sei->caps->cp_range.size, -of_node_to_fwnode (node), +of_fwnode_handle (node), &mvebu_sei_cp_domain_ops, sei);if (!sei->cp_domain) {
drivers/irqchip/irq-qcom-mpm.c +1 -1
@@ -447,7 +447,7 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent) priv->domain =irq_domain_create_hierarchy (parent_domain,IRQ_DOMAIN_FLAG_QCOM_MPM_WAKEUP , pin_cnt, -of_node_to_fwnode (np), &qcom_mpm_ops, priv); +of_fwnode_handle (np), &qcom_mpm_ops, priv);if (!priv->domain) {dev_err (dev,"failed to create MPM domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-riscv-intc.c +1 -1
@@ -242,7 +242,7 @@ static int __init riscv_intc_init(struct device_node *node, chip = &andes_intc_chip; } -return riscv_intc_init_common (of_node_to_fwnode (node), chip); +return riscv_intc_init_common (of_fwnode_handle (node), chip); }IRQCHIP_DECLARE (riscv,"riscv,cpu-intc" , riscv_intc_init);
drivers/irqchip/irq-sni-exiu.c +1 -1
@@ -249,7 +249,7 @@ static int __init exiu_dt_init(struct device_node *node,return -ENXIO ; } - data =exiu_init (of_node_to_fwnode (node), &res); + data =exiu_init (of_fwnode_handle (node), &res);if (IS_ERR (data))return PTR_ERR (data);
drivers/irqchip/irq-stm32mp-exti.c +1 -1
@@ -531,7 +531,7 @@ static int stm32mp_exti_domain_alloc(struct irq_domain *dm,if (ret)return ret;/* we only support one parent, so far */ -if (of_node_to_fwnode (out_irq.np) != dm->parent->fwnode) +if (of_fwnode_handle (out_irq.np) != dm->parent->fwnode)return -EINVAL ; of_phandle_args_to_fwspec(out_irq.np, out_irq.args,
drivers/irqchip/irq-ti-sci-inta.c +2 -2
@@ -233,7 +233,7 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_domINIT_LIST_HEAD (&vint_desc->list); parent_node =of_irq_find_parent (dev_of_node (&inta->pdev->dev)); - parent_fwspec.fwnode =of_node_to_fwnode (parent_node); + parent_fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */
@@ -709,7 +709,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)return -ENOMEM ; } - msi_domain =ti_sci_inta_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =ti_sci_inta_msi_create_irq_domain (of_fwnode_handle (node), &ti_sci_inta_msi_domain_info, domain);if (!msi_domain) {
drivers/irqchip/irq-ti-sci-intr.c +1 -1
@@ -149,7 +149,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain, goto err_irqs; parent_node =of_irq_find_parent (dev_of_node (intr->dev)); - fwspec.fwnode =of_node_to_fwnode (parent_node); + fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */
drivers/irqchip/irq-uniphier-aidet.c +1 -1
@@ -188,7 +188,7 @@ static int uniphier_aidet_probe(struct platform_device *pdev) priv->domain =irq_domain_create_hierarchy ( parent_domain,0 ,UNIPHIER_AIDET_NR_IRQS , -of_node_to_fwnode (dev->of_node), +of_fwnode_handle (dev->of_node), &uniphier_aidet_domain_ops, priv);if (!priv->domain)return -ENOMEM ;
[tip: irq/cleanups] irqchip: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 87228532e7e96871b4def877002562bfa285e6c7 Gitweb: https://git.kernel.org/tip/87228532e7e96871b4def877002562bfa285e6c7 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:28:59 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:07 +02:00
irqchip: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- drivers/irqchip/irq-alpine-msi.c | 2 +- drivers/irqchip/irq-apple-aic.c | 4 ++-- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/irqchip/irq-gic-v3.c | 4 ++-- drivers/irqchip/irq-ixp4xx.c | 2 +- drivers/irqchip/irq-lan966x-oic.c | 2 +- drivers/irqchip/irq-loongarch-cpu.c | 2 +- drivers/irqchip/irq-loongson-eiointc.c | 2 +- drivers/irqchip/irq-loongson-htvec.c | 2 +- drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-pic.c | 2 +- drivers/irqchip/irq-ls-scfg-msi.c | 2 +- drivers/irqchip/irq-meson-gpio.c | 2 +- drivers/irqchip/irq-qcom-mpm.c | 2 +- drivers/irqchip/irq-riscv-intc.c | 2 +- drivers/irqchip/irq-sni-exiu.c | 2 +- drivers/irqchip/irq-stm32mp-exti.c | 2 +- drivers/irqchip/irq-ti-sci-inta.c | 4 ++-- drivers/irqchip/irq-ti-sci-intr.c | 2 +- drivers/irqchip/irq-uniphier-aidet.c | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-)
drivers/irqchip/irq-alpine-msi.c +1 -1
@@ -213,7 +213,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv,return -ENOMEM ; } - msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &alpine_msix_domain_info, middle_domain);if (!msi_domain) {
drivers/irqchip/irq-apple-aic.c +2 -2
@@ -1014,7 +1014,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *p irqc->info.die_stride = off - start_off; - irqc->hw_domain =irq_domain_create_tree (of_node_to_fwnode (node), + irqc->hw_domain =irq_domain_create_tree (of_fwnode_handle (node), &aic_irq_domain_ops, irqc);if (WARN_ON (!irqc->hw_domain)) goto err_unmap;
@@ -1067,7 +1067,7 @@ static int __init aic_of_ic_init(struct device_node *node, struct device_node *pif (is_kernel_in_hyp_mode ()) {struct irq_fwspec mi = { - .fwnode =of_node_to_fwnode (node), + .fwnode =of_fwnode_handle (node), .param_count =3 , .param = { [0 ] =AIC_FIQ ,/* This is a lie */
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -353,7 +353,7 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,if (!mpic->msi_inner_domain)return -ENOMEM ; - mpic->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), &mpic_msi_domain_info, + mpic->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &mpic_msi_domain_info, mpic->msi_inner_domain);if (!mpic->msi_domain) {irq_domain_remove (mpic->msi_inner_domain);
@@ -492,7 +492,7 @@ static int __init mpic_ipi_init(struct mpic *mpic, struct device_node *node) {int base_ipi; - mpic->ipi_domain =irq_domain_create_linear (of_node_to_fwnode (node),IPI_DOORBELL_NR , + mpic->ipi_domain =irq_domain_create_linear (of_fwnode_handle (node),IPI_DOORBELL_NR , &mpic_ipi_domain_ops, mpic);if (WARN_ON (!mpic->ipi_domain))return -ENOMEM ;
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +1 -1
@@ -152,7 +152,7 @@ static void __init its_fsl_mc_of_msi_init(void)if (!of_property_read_bool (np,"msi-controller" ))continue ; -its_fsl_mc_msi_init_one (of_node_to_fwnode (np), +its_fsl_mc_msi_init_one (of_fwnode_handle (np), np->full_name); } }
drivers/irqchip/irq-gic-v3.c +2 -2
@@ -1826,7 +1826,7 @@ static int partition_domain_translate(struct irq_domain *d, ppi_idx =__gic_get_ppi_index (ppi_intid); ret =partition_translate_id (gic_data.ppi_descs[ppi_idx], -of_node_to_fwnode (np)); +of_fwnode_handle (np));if (ret <0 )return ret;
@@ -2192,7 +2192,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) part = &parts[part_idx]; - part->partition_id =of_node_to_fwnode (child_part); + part->partition_id =of_fwnode_handle (child_part);pr_info ("GIC: PPI partition %pOFn[%d] { " , child_part, part_idx);
drivers/irqchip/irq-ixp4xx.c +1 -1
@@ -261,7 +261,7 @@ static int __init ixp4xx_of_init_irq(struct device_node *np,pr_crit ("IXP4XX: could not ioremap interrupt controller\n" );return -ENODEV ; } - fwnode =of_node_to_fwnode (np); + fwnode =of_fwnode_handle (np);/* These chip variants have 64 interrupts */ is_356 = of_device_is_compatible(np, "intel,ixp43x-interrupt") ||
drivers/irqchip/irq-lan966x-oic.c +1 -1
@@ -224,7 +224,7 @@ static int lan966x_oic_probe(struct platform_device *pdev) .exit = lan966x_oic_chip_exit, };struct irq_domain_info d_info = { - .fwnode =of_node_to_fwnode (pdev->dev.of_node), + .fwnode =of_fwnode_handle (pdev->dev.of_node), .domain_flags =IRQ_DOMAIN_FLAG_DESTROY_GC , .size =LAN966X_OIC_NR_IRQ , .hwirq_max =LAN966X_OIC_NR_IRQ ,
drivers/irqchip/irq-loongarch-cpu.c +1 -1
@@ -100,7 +100,7 @@ static const struct irq_domain_ops loongarch_cpu_intc_irq_domain_ops = {static int __init cpuintc_of_init (struct device_node *of_node,struct device_node *parent) { - cpuintc_handle =of_node_to_fwnode (of_node); + cpuintc_handle =of_fwnode_handle (of_node); irq_domain =irq_domain_create_linear (cpuintc_handle,EXCCODE_INT_NUM , &loongarch_cpu_intc_irq_domain_ops,NULL );
drivers/irqchip/irq-loongson-eiointc.c +1 -1
@@ -554,7 +554,7 @@ static int __init eiointc_of_init(struct device_node *of_node, priv->vec_count =VEC_COUNT ; priv->node =0 ; - priv->domain_handle =of_node_to_fwnode (of_node); + priv->domain_handle =of_fwnode_handle (of_node); ret =eiointc_init (priv, parent_irq,0 );if (ret <0 )
drivers/irqchip/irq-loongson-htvec.c +1 -1
@@ -248,7 +248,7 @@ static int htvec_of_init(struct device_node *node, } err =htvec_init (res.start,resource_size (&res), - num_parents, parent_irq,of_node_to_fwnode (node)); + num_parents, parent_irq,of_fwnode_handle (node));if (err <0 )return err;
drivers/irqchip/irq-loongson-liointc.c +1 -1
@@ -363,7 +363,7 @@ static int __init liointc_of_init(struct device_node *node, } err =liointc_init (res.start,resource_size (&res), - revision,of_node_to_fwnode (node), node); + revision,of_fwnode_handle (node), node);if (err <0 )return err;
drivers/irqchip/irq-loongson-pch-msi.c +1 -1
@@ -243,7 +243,7 @@ static int pch_msi_of_init(struct device_node *node, struct device_node *parent)return -EINVAL ; } - err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_node_to_fwnode (node)); + err =pch_msi_init (res.start, irq_base, irq_count, parent_domain,of_fwnode_handle (node));if (err <0 )return err;
drivers/irqchip/irq-loongson-pch-pic.c +1 -1
@@ -392,7 +392,7 @@ static int pch_pic_of_init(struct device_node *node, } err =pch_pic_init (res.start,resource_size (&res), vec_base, - parent_domain,of_node_to_fwnode (node),0 ); + parent_domain,of_fwnode_handle (node),0 );if (err <0 )return err;
drivers/irqchip/irq-ls-scfg-msi.c +1 -1
@@ -225,7 +225,7 @@ static int ls_scfg_msi_domains_init(struct ls_scfg_msi *msi_data) } msi_data->msi_domain =pci_msi_create_irq_domain ( -of_node_to_fwnode (msi_data->pdev->dev.of_node), +of_fwnode_handle (msi_data->pdev->dev.of_node), &ls_scfg_msi_domain_info, msi_data->parent);if (!msi_data->msi_domain) {
drivers/irqchip/irq-meson-gpio.c +1 -1
@@ -607,7 +607,7 @@ static int meson_gpio_irq_of_init(struct device_node *node, struct device_node * domain =irq_domain_create_hierarchy (parent_domain,0 , ctl->params->nr_hwirq, -of_node_to_fwnode (node), +of_fwnode_handle (node), &meson_gpio_irq_domain_ops, ctl);if (!domain) {
drivers/irqchip/irq-qcom-mpm.c +1 -1
@@ -447,7 +447,7 @@ static int qcom_mpm_init(struct device_node *np, struct device_node *parent) priv->domain =irq_domain_create_hierarchy (parent_domain,IRQ_DOMAIN_FLAG_QCOM_MPM_WAKEUP , pin_cnt, -of_node_to_fwnode (np), &qcom_mpm_ops, priv); +of_fwnode_handle (np), &qcom_mpm_ops, priv);if (!priv->domain) {dev_err (dev,"failed to create MPM domain\n" ); ret = -ENOMEM ;
drivers/irqchip/irq-riscv-intc.c +1 -1
@@ -242,7 +242,7 @@ static int __init riscv_intc_init(struct device_node *node, chip = &andes_intc_chip; } -return riscv_intc_init_common (of_node_to_fwnode (node), chip); +return riscv_intc_init_common (of_fwnode_handle (node), chip); }IRQCHIP_DECLARE (riscv,"riscv,cpu-intc" , riscv_intc_init);
drivers/irqchip/irq-sni-exiu.c +1 -1
@@ -249,7 +249,7 @@ static int __init exiu_dt_init(struct device_node *node,return -ENXIO ; } - data =exiu_init (of_node_to_fwnode (node), &res); + data =exiu_init (of_fwnode_handle (node), &res);if (IS_ERR (data))return PTR_ERR (data);
drivers/irqchip/irq-stm32mp-exti.c +1 -1
@@ -531,7 +531,7 @@ static int stm32mp_exti_domain_alloc(struct irq_domain *dm,if (ret)return ret;/* we only support one parent, so far */ -if (of_node_to_fwnode (out_irq.np) != dm->parent->fwnode) +if (of_fwnode_handle (out_irq.np) != dm->parent->fwnode)return -EINVAL ; of_phandle_args_to_fwspec(out_irq.np, out_irq.args,
drivers/irqchip/irq-ti-sci-inta.c +2 -2
@@ -233,7 +233,7 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_domINIT_LIST_HEAD (&vint_desc->list); parent_node =of_irq_find_parent (dev_of_node (&inta->pdev->dev)); - parent_fwspec.fwnode =of_node_to_fwnode (parent_node); + parent_fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */
@@ -709,7 +709,7 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)return -ENOMEM ; } - msi_domain =ti_sci_inta_msi_create_irq_domain (of_node_to_fwnode (node), + msi_domain =ti_sci_inta_msi_create_irq_domain (of_fwnode_handle (node), &ti_sci_inta_msi_domain_info, domain);if (!msi_domain) {
drivers/irqchip/irq-ti-sci-intr.c +1 -1
@@ -149,7 +149,7 @@ static int ti_sci_intr_alloc_parent_irq(struct irq_domain *domain, goto err_irqs; parent_node =of_irq_find_parent (dev_of_node (intr->dev)); - fwspec.fwnode =of_node_to_fwnode (parent_node); + fwspec.fwnode =of_fwnode_handle (parent_node);if (of_device_is_compatible (parent_node,"arm,gic-v3" )) {/* Parent is GIC */
drivers/irqchip/irq-uniphier-aidet.c +1 -1
@@ -188,7 +188,7 @@ static int uniphier_aidet_probe(struct platform_device *pdev) priv->domain =irq_domain_create_hierarchy ( parent_domain,0 ,UNIPHIER_AIDET_NR_IRQS , -of_node_to_fwnode (dev->of_node), +of_fwnode_handle (dev->of_node), &uniphier_aidet_domain_ops, priv);if (!priv->domain)return -ENOMEM ;
PATCH v2 7/57 irqdomain: pci: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- drivers/pci/controller/mobiveil/pcie-mobiveil-host.c | 2 +- drivers/pci/controller/pci-xgene-msi.c | 2 +- drivers/pci/controller/pcie-altera-msi.c | 2 +- drivers/pci/controller/pcie-brcmstb.c | 2 +- drivers/pci/controller/pcie-iproc-msi.c | 2 +- drivers/pci/controller/pcie-mediatek.c | 2 +- drivers/pci/controller/pcie-xilinx-dma-pl.c | 2 +- drivers/pci/controller/pcie-xilinx-nwl.c | 2 +- drivers/pci/controller/plda/pcie-plda-host.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +1 -1
@@ -227,7 +227,7 @@ static const struct irq_domain_ops dw_pcie_msi_domain_ops = {int dw_pcie_allocate_domains (struct dw_pcie_rp *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct fwnode_handle *fwnode =of_node_to_fwnode (pci->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (pci->dev->of_node); pp->irq_domain =irq_domain_create_linear (fwnode, pp->num_vectors, &dw_pcie_msi_domain_ops, pp);
drivers/pci/controller/mobiveil/pcie-mobiveil-host.c +1 -1
@@ -435,7 +435,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int mobiveil_allocate_msi_domains (struct mobiveil_pcie *pcie) {struct device *dev = &pcie->pdev->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct mobiveil_msi *msi = &pcie->rp.msi;mutex_init (&msi->lock);
drivers/pci/controller/pci-xgene-msi.c +1 -1
@@ -247,7 +247,7 @@ static int xgene_allocate_domains(struct xgene_msi *msi)if (!msi->inner_domain)return -ENOMEM ; - msi->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (msi->node), + msi->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (msi->node), &xgene_msi_domain_info, msi->inner_domain);
drivers/pci/controller/pcie-altera-msi.c +1 -1
@@ -164,7 +164,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int altera_allocate_domains (struct altera_msi *msi) { -struct fwnode_handle *fwnode =of_node_to_fwnode (msi->pdev->dev.of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (msi->pdev->dev.of_node); msi->inner_domain =irq_domain_add_linear (NULL , msi->num_of_vectors, &msi_domain_ops, msi);
drivers/pci/controller/pcie-brcmstb.c +1 -1
@@ -581,7 +581,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int brcm_allocate_domains (struct brcm_msi *msi) { -struct fwnode_handle *fwnode =of_node_to_fwnode (msi->np); +struct fwnode_handle *fwnode =of_fwnode_handle (msi->np);struct device *dev = msi->dev; msi->inner_domain =irq_domain_add_linear (NULL , msi->nr, &msi_domain_ops, msi);
drivers/pci/controller/pcie-iproc-msi.c +1 -1
@@ -451,7 +451,7 @@ static int iproc_msi_alloc_domains(struct device_node *node,if (!msi->inner_domain)return -ENOMEM ; - msi->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), + msi->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &iproc_msi_domain_info, msi->inner_domain);if (!msi->msi_domain) {
drivers/pci/controller/pcie-mediatek.c +1 -1
@@ -485,7 +485,7 @@ static struct msi_domain_info mtk_msi_domain_info = {static int mtk_pcie_allocate_msi_domains (struct mtk_pcie_port *port) { -struct fwnode_handle *fwnode =of_node_to_fwnode (port->pcie->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (port->pcie->dev->of_node);mutex_init (&port->lock);
drivers/pci/controller/pcie-xilinx-dma-pl.c +1 -1
@@ -470,7 +470,7 @@ static int xilinx_pl_dma_pcie_init_msi_irq_domain(struct pl_dma_pcie *port)struct device *dev = port->dev;struct xilinx_msi *msi = &port->msi;int size =BITS_TO_LONGS (XILINX_NUM_MSI_IRQS ) *sizeof (long ); -struct fwnode_handle *fwnode =of_node_to_fwnode (port->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (port->dev->of_node); msi->dev_domain =irq_domain_add_linear (NULL ,XILINX_NUM_MSI_IRQS , &dev_msi_domain_ops, port);
drivers/pci/controller/pcie-xilinx-nwl.c +1 -1
@@ -495,7 +495,7 @@ static int nwl_pcie_init_msi_irq_domain(struct nwl_pcie *pcie) {#ifdef CONFIG_PCI_MSI struct device *dev = pcie->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct nwl_msi *msi = &pcie->msi; msi->dev_domain = irq_domain_add_linear(NULL, INT_PCI_MSI_NR,
drivers/pci/controller/plda/pcie-plda-host.c +1 -1
@@ -150,7 +150,7 @@ static struct msi_domain_info plda_msi_domain_info = {static int plda_allocate_msi_domains (struct plda_pcie_rp *port) {struct device *dev = port->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct plda_msi *msi = &port->msi;mutex_init (&port->msi.lock);
Signature · 1 line
2.49.0
Re: [PATCH v2 07/57] irqdomain: pci: Switch to of_fwnode_handle()
Quoted 3 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
I'm fine with these and happy to apply via the PCI tree, but it sounds like you're planning a v3 with a few updates, so I'll hold off for now:
Re: [PATCH v2 07/57] irqdomain: pci: Switch to of_fwnode_handle()
Quoted 10 lines · Bjorn Helgaas
Quoted 3 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.I'm fine with these and happy to apply via the PCI tree, but it sounds like you're planning a v3 with a few updates, so I'll hold off for now:
Right, there will be a v3 to deal better with irq_domain_create_*()'s first parameter (patches 13-39/57 later in this series).
But this very patch (of_fwnode_handle() cleanup sub-series) won't be affected, so please take it through your tree, if you can.
I will fix up the _create_ subseries and resend non-merged patches from this series in v3 later. So it's also fine to wait for v3. (But less I have to resend (unmodified), the better ;).)
thanks,
Signature · 2 lines
js suse labs
Re: [PATCH v2 07/57] irqdomain: pci: Switch to of_fwnode_handle()
Quoted 10 lines · Jiri Slaby
Quoted 9 lines · Bjorn Helgaas
Quoted 3 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.I'm fine with these and happy to apply via the PCI tree, but it sounds like you're planning a v3 with a few updates, so I'll hold off for now:
Quoted 5 lines
Quoted 1 line
Right, there will be a v3 to deal better with irq_domain_create_*()'s first parameter (patches 13-39/57 later in this series).
But this very patch (
of_fwnode_handle()cleanup sub-series) won't be affected, so please take it through your tree, if you can.
FWIW, the patch was [email protected] if you already dropped it.
Quoted 3 lines
I will fix up the _create_ subseries and resend non-merged patches from this series in v3 later. So it's also fine to wait for v3. (But less I have to resend (unmodified), the better ;).)
thanks,
Signature · 2 lines
js suse labs
Bjorn Helgaas
AppliedRe: [PATCH v2 07/57] irqdomain: pci: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)Quoted 21 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Jingoo Han <[email protected]>Cc Manivannan Sadhasivam <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc "Krzysztof Wilczyński" <[email protected]>Cc Rob Herring <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Karthikeyan Mitran <[email protected]>Cc Hou Zhiqiang <[email protected]>Cc Toan Le <[email protected]>Cc Joyce Ooi <[email protected]>Cc Jim Quinlan <[email protected]>Cc Nicolas Saenz Julienne <[email protected]>Cc Florian Fainelli <[email protected]>Cc Broadcom internal kernel review list <[email protected]>Cc Ray Jui <[email protected]>Cc Scott Branden <[email protected]>
Quoted 8 lines
Cc Ryder Lee <[email protected]>Cc Jianjun Wang <[email protected]>Cc Michal Simek <[email protected]>Cc Daire McNamara <[email protected]>
Applied to pci/irq for v6.16, thanks!
Quoted 146 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- drivers/pci/controller/mobiveil/pcie-mobiveil-host.c | 2 +- drivers/pci/controller/pci-xgene-msi.c | 2 +- drivers/pci/controller/pcie-altera-msi.c | 2 +- drivers/pci/controller/pcie-brcmstb.c | 2 +- drivers/pci/controller/pcie-iproc-msi.c | 2 +- drivers/pci/controller/pcie-mediatek.c | 2 +- drivers/pci/controller/pcie-xilinx-dma-pl.c | 2 +- drivers/pci/controller/pcie-xilinx-nwl.c | 2 +- drivers/pci/controller/plda/pcie-plda-host.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +1
-1@@ -227,7 +227,7 @@ static const struct irq_domain_ops dw_pcie_msi_domain_ops = {int dw_pcie_allocate_domains (struct dw_pcie_rp *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct fwnode_handle *fwnode =of_node_to_fwnode (pci->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (pci->dev->of_node); pp->irq_domain =irq_domain_create_linear (fwnode, pp->num_vectors, &dw_pcie_msi_domain_ops, pp);drivers/pci/controller/mobiveil/pcie-mobiveil-host.c +1
-1@@ -435,7 +435,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int mobiveil_allocate_msi_domains (struct mobiveil_pcie *pcie) {struct device *dev = &pcie->pdev->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct mobiveil_msi *msi = &pcie->rp.msi;mutex_init (&msi->lock);drivers/pci/controller/pci-xgene-msi.c +1
-1@@ -247,7 +247,7 @@ static int xgene_allocate_domains(struct xgene_msi *msi)if (!msi->inner_domain)return -ENOMEM ; - msi->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (msi->node), + msi->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (msi->node), &xgene_msi_domain_info, msi->inner_domain);drivers/pci/controller/pcie-altera-msi.c +1
-1@@ -164,7 +164,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int altera_allocate_domains (struct altera_msi *msi) { -struct fwnode_handle *fwnode =of_node_to_fwnode (msi->pdev->dev.of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (msi->pdev->dev.of_node); msi->inner_domain =irq_domain_add_linear (NULL , msi->num_of_vectors, &msi_domain_ops, msi);drivers/pci/controller/pcie-brcmstb.c +1
-1@@ -581,7 +581,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int brcm_allocate_domains (struct brcm_msi *msi) { -struct fwnode_handle *fwnode =of_node_to_fwnode (msi->np); +struct fwnode_handle *fwnode =of_fwnode_handle (msi->np);struct device *dev = msi->dev; msi->inner_domain =irq_domain_add_linear (NULL , msi->nr, &msi_domain_ops, msi);drivers/pci/controller/pcie-iproc-msi.c +1
-1@@ -451,7 +451,7 @@ static int iproc_msi_alloc_domains(struct device_node *node,if (!msi->inner_domain)return -ENOMEM ; - msi->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), + msi->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &iproc_msi_domain_info, msi->inner_domain);if (!msi->msi_domain) {drivers/pci/controller/pcie-mediatek.c +1
-1@@ -485,7 +485,7 @@ static struct msi_domain_info mtk_msi_domain_info = {static int mtk_pcie_allocate_msi_domains (struct mtk_pcie_port *port) { -struct fwnode_handle *fwnode =of_node_to_fwnode (port->pcie->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (port->pcie->dev->of_node);mutex_init (&port->lock);drivers/pci/controller/pcie-xilinx-dma-pl.c +1
-1@@ -470,7 +470,7 @@ static int xilinx_pl_dma_pcie_init_msi_irq_domain(struct pl_dma_pcie *port)struct device *dev = port->dev;struct xilinx_msi *msi = &port->msi;int size =BITS_TO_LONGS (XILINX_NUM_MSI_IRQS ) *sizeof (long ); -struct fwnode_handle *fwnode =of_node_to_fwnode (port->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (port->dev->of_node); msi->dev_domain =irq_domain_add_linear (NULL ,XILINX_NUM_MSI_IRQS , &dev_msi_domain_ops, port);drivers/pci/controller/pcie-xilinx-nwl.c +1
-1@@ -495,7 +495,7 @@ static int nwl_pcie_init_msi_irq_domain(struct nwl_pcie *pcie) {#ifdef CONFIG_PCI_MSI struct device *dev = pcie->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct nwl_msi *msi = &pcie->msi; msi->dev_domain = irq_domain_add_linear(NULL, INT_PCI_MSI_NR,drivers/pci/controller/plda/pcie-plda-host.c +1
-1@@ -150,7 +150,7 @@ static struct msi_domain_info plda_msi_domain_info = {static int plda_allocate_msi_domains (struct plda_pcie_rp *port) {struct device *dev = port->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct plda_msi *msi = &port->msi;mutex_init (&port->msi.lock);Signature · 1 line
2.49.0
[tip: irq/cleanups] irqdomain: pci: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: fdc348121f2465897792f946715a5da7887e5f97 Gitweb: https://git.kernel.org/tip/fdc348121f2465897792f946715a5da7887e5f97 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:00 +01:00 Committer: Bjorn Helgaas <[email protected]> CommitterDate: Mon, 07 Apr 2025 12:15:14 -05:00
irqdomain: pci: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- drivers/pci/controller/mobiveil/pcie-mobiveil-host.c | 2 +- drivers/pci/controller/pci-xgene-msi.c | 2 +- drivers/pci/controller/pcie-altera-msi.c | 2 +- drivers/pci/controller/pcie-brcmstb.c | 2 +- drivers/pci/controller/pcie-iproc-msi.c | 2 +- drivers/pci/controller/pcie-mediatek.c | 2 +- drivers/pci/controller/pcie-xilinx-dma-pl.c | 2 +- drivers/pci/controller/pcie-xilinx-nwl.c | 2 +- drivers/pci/controller/plda/pcie-plda-host.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +1 -1
@@ -227,7 +227,7 @@ static const struct irq_domain_ops dw_pcie_msi_domain_ops = {int dw_pcie_allocate_domains (struct dw_pcie_rp *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct fwnode_handle *fwnode =of_node_to_fwnode (pci->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (pci->dev->of_node); pp->irq_domain =irq_domain_create_linear (fwnode, pp->num_vectors, &dw_pcie_msi_domain_ops, pp);
drivers/pci/controller/mobiveil/pcie-mobiveil-host.c +1 -1
@@ -435,7 +435,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int mobiveil_allocate_msi_domains (struct mobiveil_pcie *pcie) {struct device *dev = &pcie->pdev->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct mobiveil_msi *msi = &pcie->rp.msi;mutex_init (&msi->lock);
drivers/pci/controller/pci-xgene-msi.c +1 -1
@@ -247,7 +247,7 @@ static int xgene_allocate_domains(struct xgene_msi *msi)if (!msi->inner_domain)return -ENOMEM ; - msi->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (msi->node), + msi->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (msi->node), &xgene_msi_domain_info, msi->inner_domain);
drivers/pci/controller/pcie-altera-msi.c +1 -1
@@ -164,7 +164,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int altera_allocate_domains (struct altera_msi *msi) { -struct fwnode_handle *fwnode =of_node_to_fwnode (msi->pdev->dev.of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (msi->pdev->dev.of_node); msi->inner_domain =irq_domain_add_linear (NULL , msi->num_of_vectors, &msi_domain_ops, msi);
drivers/pci/controller/pcie-brcmstb.c +1 -1
@@ -581,7 +581,7 @@ static const struct irq_domain_ops msi_domain_ops = {static int brcm_allocate_domains (struct brcm_msi *msi) { -struct fwnode_handle *fwnode =of_node_to_fwnode (msi->np); +struct fwnode_handle *fwnode =of_fwnode_handle (msi->np);struct device *dev = msi->dev; msi->inner_domain =irq_domain_add_linear (NULL , msi->nr, &msi_domain_ops, msi);
drivers/pci/controller/pcie-iproc-msi.c +1 -1
@@ -451,7 +451,7 @@ static int iproc_msi_alloc_domains(struct device_node *node,if (!msi->inner_domain)return -ENOMEM ; - msi->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (node), + msi->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (node), &iproc_msi_domain_info, msi->inner_domain);if (!msi->msi_domain) {
drivers/pci/controller/pcie-mediatek.c +1 -1
@@ -485,7 +485,7 @@ static struct msi_domain_info mtk_msi_domain_info = {static int mtk_pcie_allocate_msi_domains (struct mtk_pcie_port *port) { -struct fwnode_handle *fwnode =of_node_to_fwnode (port->pcie->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (port->pcie->dev->of_node);mutex_init (&port->lock);
drivers/pci/controller/pcie-xilinx-dma-pl.c +1 -1
@@ -470,7 +470,7 @@ static int xilinx_pl_dma_pcie_init_msi_irq_domain(struct pl_dma_pcie *port)struct device *dev = port->dev;struct xilinx_msi *msi = &port->msi;int size =BITS_TO_LONGS (XILINX_NUM_MSI_IRQS ) *sizeof (long ); -struct fwnode_handle *fwnode =of_node_to_fwnode (port->dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (port->dev->of_node); msi->dev_domain =irq_domain_add_linear (NULL ,XILINX_NUM_MSI_IRQS , &dev_msi_domain_ops, port);
drivers/pci/controller/pcie-xilinx-nwl.c +1 -1
@@ -495,7 +495,7 @@ static int nwl_pcie_init_msi_irq_domain(struct nwl_pcie *pcie) {#ifdef CONFIG_PCI_MSI struct device *dev = pcie->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct nwl_msi *msi = &pcie->msi; msi->dev_domain = irq_domain_add_linear(NULL, INT_PCI_MSI_NR,
drivers/pci/controller/plda/pcie-plda-host.c +1 -1
@@ -150,7 +150,7 @@ static struct msi_domain_info plda_msi_domain_info = {static int plda_allocate_msi_domains (struct plda_pcie_rp *port) {struct device *dev = port->dev; -struct fwnode_handle *fwnode =of_node_to_fwnode (dev->of_node); +struct fwnode_handle *fwnode =of_fwnode_handle (dev->of_node);struct plda_msi *msi = &port->msi;mutex_init (&port->msi.lock);
PATCH v2 8/57 irqdomain: ppc: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/msi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -1897,7 +1897,7 @@ static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsignedreturn -ENOMEM ; } - hose->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (hose->dn), + hose->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (hose->dn), &pnv_msi_domain_info, hose->dev_domain);if (!hose->msi_domain) {
arch/powerpc/platforms/pseries/msi.c +1 -1
@@ -628,7 +628,7 @@ static int __pseries_msi_allocate_domains(struct pci_controller *phb,return -ENOMEM ; } - phb->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (phb->dn), + phb->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (phb->dn), &pseries_msi_domain_info, phb->dev_domain);if (!phb->msi_domain) {
Signature · 1 line
2.49.0
Re: [PATCH v2 08/57] irqdomain: ppc: Switch to of_fwnode_handle()
@PPC maintainers: if you have not read 00/57 [1], please route this through your tree.
[1] https://lore.kernel.org/all/[email protected]/
Thanks.
Quoted 42 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Madhavan Srinivasan <[email protected]>Cc Michael Ellerman <[email protected]>Cc Nicholas Piggin <[email protected]>Cc Christophe Leroy <[email protected]>Cc Naveen N Rao <[email protected]>--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/msi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)arch/powerpc/platforms/powernv/pci-ioda.c +1
-1@@ -1897,7 +1897,7 @@ static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsignedreturn -ENOMEM ; } - hose->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (hose->dn), + hose->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (hose->dn), &pnv_msi_domain_info, hose->dev_domain);if (!hose->msi_domain) {arch/powerpc/platforms/pseries/msi.c +1
-1@@ -628,7 +628,7 @@ static int __pseries_msi_allocate_domains(struct pci_controller *phb,return -ENOMEM ; } - phb->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (phb->dn), + phb->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (phb->dn), &pseries_msi_domain_info, phb->dev_domain);if (!phb->msi_domain) {
Signature · 2 lines
js suse labs
[tip: irq/cleanups] powerpc: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 88c8e3b74227973d243d135b3eacfb35a9f77daf Gitweb: https://git.kernel.org/tip/88c8e3b74227973d243d135b3eacfb35a9f77daf Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:01 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:03 +02:00
powerpc: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/msi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -1897,7 +1897,7 @@ static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsignedreturn -ENOMEM ; } - hose->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (hose->dn), + hose->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (hose->dn), &pnv_msi_domain_info, hose->dev_domain);if (!hose->msi_domain) {
arch/powerpc/platforms/pseries/msi.c +1 -1
@@ -628,7 +628,7 @@ static int __pseries_msi_allocate_domains(struct pci_controller *phb,return -ENOMEM ; } - phb->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (phb->dn), + phb->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (phb->dn), &pseries_msi_domain_info, phb->dev_domain);if (!phb->msi_domain) {
[tip: irq/cleanups] powerpc: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: c8795085c70aacf7f5eb4308d2191df1cf721a7a Gitweb: https://git.kernel.org/tip/c8795085c70aacf7f5eb4308d2191df1cf721a7a Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:01 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:21 +02:00
powerpc: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/msi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -1897,7 +1897,7 @@ static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsignedreturn -ENOMEM ; } - hose->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (hose->dn), + hose->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (hose->dn), &pnv_msi_domain_info, hose->dev_domain);if (!hose->msi_domain) {
arch/powerpc/platforms/pseries/msi.c +1 -1
@@ -628,7 +628,7 @@ static int __pseries_msi_allocate_domains(struct pci_controller *phb,return -ENOMEM ; } - phb->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (phb->dn), + phb->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (phb->dn), &pseries_msi_domain_info, phb->dev_domain);if (!phb->msi_domain) {
[tip: irq/cleanups] powerpc: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: f09831892c801b3875a247dc631fcbc2e704ca1f Gitweb: https://git.kernel.org/tip/f09831892c801b3875a247dc631fcbc2e704ca1f Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:01 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:08 +02:00
powerpc: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/msi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -1897,7 +1897,7 @@ static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsignedreturn -ENOMEM ; } - hose->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (hose->dn), + hose->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (hose->dn), &pnv_msi_domain_info, hose->dev_domain);if (!hose->msi_domain) {
arch/powerpc/platforms/pseries/msi.c +1 -1
@@ -628,7 +628,7 @@ static int __pseries_msi_allocate_domains(struct pci_controller *phb,return -ENOMEM ; } - phb->msi_domain =pci_msi_create_irq_domain (of_node_to_fwnode (phb->dn), + phb->msi_domain =pci_msi_create_irq_domain (of_fwnode_handle (phb->dn), &pseries_msi_domain_info, phb->dev_domain);if (!phb->msi_domain) {
PATCH v2 9/57 irqdomain: remoteproc: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
--- drivers/remoteproc/pru_rproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/remoteproc/pru_rproc.c +1 -1
@@ -563,7 +563,7 @@ static int pru_handle_intrmap(struct rproc *rproc)return -ENODEV ; } - fwspec.fwnode =of_node_to_fwnode (irq_parent); + fwspec.fwnode =of_fwnode_handle (irq_parent); fwspec.param_count =3 ;for (i =0 ; i < pru->evt_count; i++) { fwspec.param[0 ] = rsc->pru_intc_map[i].event;
Signature · 1 line
2.49.0
Re: [PATCH v2 09/57] irqdomain: remoteproc: Switch to of_fwnode_handle()
Quoted 17 lines · Jiri Slaby (SUSE)
of_node_to_fwnode()is irqdomain's reimplementation of the "officially" definedof_fwnode_handle(). The former is in the process of being removed, so use the latter instead.Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Mathieu Poirier <[email protected]>--- drivers/remoteproc/pru_rproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/remoteproc/pru_rproc.c +0
-0
drivers/remoteproc/pru_rproc.c static int pru_handle_intrmap(struct rproc *rproc) · line 566
Quoted 5 lines
drivers/remoteproc/pru_rproc.c +1
-1@@ -563,7 +563,7 @@ static int pru_handle_intrmap(struct rproc *rproc)return -ENODEV ; } - fwspec.fwnode =of_node_to_fwnode (irq_parent); + fwspec.fwnode =of_fwnode_handle (irq_parent);
Applied.
Thanks,
Mathieu
Quoted 6 lines
drivers/remoteproc/pru_rproc.c +0
-0fwspec.param_count =3 ;for (i =0 ; i < pru->evt_count; i++) { fwspec.param[0 ] = rsc->pru_intc_map[i].event;Signature · 1 line
2.49.0
PATCH v2 10/57 irqdomain: x86: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
--- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2225,7 +2225,7 @@ static int mp_irqdomain_create(int ioapic)/* Handle device tree enumerated APICs proper */ if (cfg->dev) { - fn =of_node_to_fwnode (cfg->dev); + fn =of_fwnode_handle (cfg->dev); }else { fn =irq_domain_alloc_named_id_fwnode ("IO-APIC" ,mpc_ioapic_id (ioapic));if (!fn)
Signature · 1 line
2.49.0
[tip: irq/cleanups] x86/io_apic: Switch to of_fwnode_handle()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 51cd7f0bee520df4dbbee6d8f813f970e3d57edb Gitweb: https://git.kernel.org/tip/51cd7f0bee520df4dbbee6d8f813f970e3d57edb Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:03 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:04 +02:00
x86/io_apic: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2225,7 +2225,7 @@ static int mp_irqdomain_create(int ioapic)/* Handle device tree enumerated APICs proper */ if (cfg->dev) { - fn =of_node_to_fwnode (cfg->dev); + fn =of_fwnode_handle (cfg->dev); }else { fn =irq_domain_alloc_named_id_fwnode ("IO-APIC" ,mpc_ioapic_id (ioapic));if (!fn)
[tip: irq/cleanups] x86/io_apic: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: bd7833adad5037ea3690e64b11892f90f1b50878 Gitweb: https://git.kernel.org/tip/bd7833adad5037ea3690e64b11892f90f1b50878 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:03 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:21 +02:00
x86/io_apic: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2225,7 +2225,7 @@ static int mp_irqdomain_create(int ioapic)/* Handle device tree enumerated APICs proper */ if (cfg->dev) { - fn =of_node_to_fwnode (cfg->dev); + fn =of_fwnode_handle (cfg->dev); }else { fn =irq_domain_alloc_named_id_fwnode ("IO-APIC" ,mpc_ioapic_id (ioapic));if (!fn)
[tip: irq/cleanups] x86/io_apic: Switch to of_fwnode_handle()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: b712918091c9c712a77f1c85c29e5bb750e9e281 Gitweb: https://git.kernel.org/tip/b712918091c9c712a77f1c85c29e5bb750e9e281 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:03 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:08 +02:00
x86/io_apic: Switch to of_fwnode_handle()
of_node_to_fwnode() is irqdomain's reimplementation of the "officially" defined of_fwnode_handle(). The former is in the process of being removed, so use the latter instead.
[ tglx: Fix up subject prefix ]
--- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2225,7 +2225,7 @@ static int mp_irqdomain_create(int ioapic)/* Handle device tree enumerated APICs proper */ if (cfg->dev) { - fn =of_node_to_fwnode (cfg->dev); + fn =of_fwnode_handle (cfg->dev); }else { fn =irq_domain_alloc_named_id_fwnode ("IO-APIC" ,mpc_ioapic_id (ioapic));if (!fn)
PATCH v2 11/57 irqdomain: Drop of_node_to_fwnode()
In reply to Jiri Slaby (SUSE)All uses of of_node_to_fwnode() in non-irqdomain code were changed to "officially" defined of_fwnode_handle(). Therefore, the former can be dropped along with the last uses in the irqdomain code.
--- include/linux/irqdomain.h | 17 ++++++----------- kernel/irq/irqdomain.c | 4 ++-- 2 files changed, 8 insertions(+), 13 deletions(-)
include/linux/irqdomain.h +6 -11
@@ -358,11 +358,6 @@ int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node, const struct irq_affinity_desc *affinity); -static inline struct fwnode_handle *of_node_to_fwnode (struct device_node *node) -{ -return node ? &node->fwnode :NULL ; -} -extern const struct fwnode_operations irqchip_fwnode_ops;static inline bool is_fwnode_irqchip (const struct fwnode_handle *fwnode)
@@ -387,7 +382,7 @@ struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,static inline struct irq_domain *irq_find_matching_host (struct device_node *node,enum irq_domain_bus_token bus_token) { -return irq_find_matching_fwnode (of_node_to_fwnode (node), bus_token); +return irq_find_matching_fwnode (of_fwnode_handle (node), bus_token); }static inline struct irq_domain *irq_find_host (struct device_node *node)
@@ -407,7 +402,7 @@ static inline struct irq_domain *irq_domain_add_simple(struct device_node *of_noconst struct irq_domain_ops *ops, void *host_data) { - return irq_domain_create_simple(of_node_to_fwnode(of_node), size, first_irq, ops, host_data); + return irq_domain_create_simple(of_fwnode_handle(of_node), size, first_irq, ops, host_data); }/**
@@ -423,7 +418,7 @@ static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_no void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .size = size, .hwirq_max = size, .ops = ops,
@@ -442,7 +437,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nod void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .hwirq_max = max_irq, .direct_max = max_irq, .ops = ops,
@@ -462,7 +457,7 @@ static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .hwirq_max = ~0U , .ops = ops, .host_data = host_data,
@@ -611,7 +606,7 @@ static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *par void *host_data) {return irq_domain_create_hierarchy (parent, flags, size, -of_node_to_fwnode (node), +of_fwnode_handle (node), ops, host_data); }
kernel/irq/irqdomain.c +2 -2
@@ -502,7 +502,7 @@ struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,const struct irq_domain_ops *ops, void *host_data) { - return irq_domain_create_legacy(of_node_to_fwnode(of_node), size, + return irq_domain_create_legacy(of_fwnode_handle(of_node), size,first_irq ,first_hwirq ,ops ,host_data ); }EXPORT_SYMBOL_GPL (irq_domain_add_legacy);
@@ -885,7 +885,7 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args, {int i; - fwspec->fwnode =of_node_to_fwnode (np); + fwspec->fwnode =of_fwnode_handle (np); fwspec->param_count = count;for (i =0 ; i < count; i++)
Signature · 1 line
2.49.0
[tip: irq/cleanups] irqdomain: Drop of_node_to_fwnode()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 851feeb8d6b7c3e7bfdda691d625523310ff231e Gitweb: https://git.kernel.org/tip/851feeb8d6b7c3e7bfdda691d625523310ff231e Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:04 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:04 +02:00
irqdomain: Drop of_node_to_fwnode()
All uses of of_node_to_fwnode() in non-irqdomain code were changed to "officially" defined of_fwnode_handle(). Therefore, the former can be dropped along with the last uses in the irqdomain code.
Due to merge logistics the inline cannot be dropped immediately. Move it to a deprecated section, which will be removed during the merge window.
[ tglx: Handle merge logistics ]
--- include/linux/irqdomain.h | 23 ++++++++++++----------- kernel/irq/irqdomain.c | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-)
include/linux/irqdomain.h +12 -11
@@ -358,11 +358,6 @@ int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node, const struct irq_affinity_desc *affinity); -static inline struct fwnode_handle *of_node_to_fwnode (struct device_node *node) -{ -return node ? &node->fwnode :NULL ; -} -extern const struct fwnode_operations irqchip_fwnode_ops;static inline bool is_fwnode_irqchip (const struct fwnode_handle *fwnode)
@@ -387,7 +382,7 @@ struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,static inline struct irq_domain *irq_find_matching_host (struct device_node *node,enum irq_domain_bus_token bus_token) { -return irq_find_matching_fwnode (of_node_to_fwnode (node), bus_token); +return irq_find_matching_fwnode (of_fwnode_handle (node), bus_token); }static inline struct irq_domain *irq_find_host (struct device_node *node)
@@ -407,7 +402,7 @@ static inline struct irq_domain *irq_domain_add_simple(struct device_node *of_noconst struct irq_domain_ops *ops, void *host_data) { - return irq_domain_create_simple(of_node_to_fwnode(of_node), size, first_irq, ops, host_data); + return irq_domain_create_simple(of_fwnode_handle(of_node), size, first_irq, ops, host_data); }/**
@@ -423,7 +418,7 @@ static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_no void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .size = size, .hwirq_max = size, .ops = ops,
@@ -442,7 +437,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nod void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .hwirq_max = max_irq, .direct_max = max_irq, .ops = ops,
@@ -462,7 +457,7 @@ static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .hwirq_max = ~0U , .ops = ops, .host_data = host_data,
@@ -611,7 +606,7 @@ static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *par void *host_data) {return irq_domain_create_hierarchy (parent, flags, size, -of_node_to_fwnode (node), +of_fwnode_handle (node), ops, host_data); }
@@ -755,6 +750,12 @@ static inline void msi_device_domain_free_wired(struct irq_domain *domain, unsig }#endif +/* Deprecated functions. Will be removed in the merge window */ +static inline struct fwnode_handle *of_node_to_fwnode (struct device_node *node) +{ +return node ? &node->fwnode :NULL ; +} +#else /* CONFIG_IRQ_DOMAIN */ static inline void irq_dispose_mapping (unsigned int virq) { } static inline struct irq_domain *irq_find_matching_fwnode(
kernel/irq/irqdomain.c +2 -2
@@ -502,7 +502,7 @@ struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,const struct irq_domain_ops *ops, void *host_data) { - return irq_domain_create_legacy(of_node_to_fwnode(of_node), size, + return irq_domain_create_legacy(of_fwnode_handle(of_node), size,first_irq ,first_hwirq ,ops ,host_data ); }EXPORT_SYMBOL_GPL (irq_domain_add_legacy);
@@ -885,7 +885,7 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args, {int i; - fwspec->fwnode =of_node_to_fwnode (np); + fwspec->fwnode =of_fwnode_handle (np); fwspec->param_count = count;for (i =0 ; i < count; i++)
[tip: irq/cleanups] irqdomain: Drop of_node_to_fwnode()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 64e4d65310656fac554ebfdeac14fa198605206f Gitweb: https://git.kernel.org/tip/64e4d65310656fac554ebfdeac14fa198605206f Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:04 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:21 +02:00
irqdomain: Drop of_node_to_fwnode()
All uses of of_node_to_fwnode() in non-irqdomain code were changed to "officially" defined of_fwnode_handle(). Therefore, the former can be dropped along with the last uses in the irqdomain code.
Due to merge logistics the inline cannot be dropped immediately. Move it to a deprecated section, which will be removed during the merge window.
[ tglx: Handle merge logistics ]
--- include/linux/irqdomain.h | 23 ++++++++++++----------- kernel/irq/irqdomain.c | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-)
include/linux/irqdomain.h +12 -11
@@ -358,11 +358,6 @@ int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node, const struct irq_affinity_desc *affinity); -static inline struct fwnode_handle *of_node_to_fwnode (struct device_node *node) -{ -return node ? &node->fwnode :NULL ; -} -extern const struct fwnode_operations irqchip_fwnode_ops;static inline bool is_fwnode_irqchip (const struct fwnode_handle *fwnode)
@@ -387,7 +382,7 @@ struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,static inline struct irq_domain *irq_find_matching_host (struct device_node *node,enum irq_domain_bus_token bus_token) { -return irq_find_matching_fwnode (of_node_to_fwnode (node), bus_token); +return irq_find_matching_fwnode (of_fwnode_handle (node), bus_token); }static inline struct irq_domain *irq_find_host (struct device_node *node)
@@ -407,7 +402,7 @@ static inline struct irq_domain *irq_domain_add_simple(struct device_node *of_noconst struct irq_domain_ops *ops, void *host_data) { - return irq_domain_create_simple(of_node_to_fwnode(of_node), size, first_irq, ops, host_data); + return irq_domain_create_simple(of_fwnode_handle(of_node), size, first_irq, ops, host_data); }/**
@@ -423,7 +418,7 @@ static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_no void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .size = size, .hwirq_max = size, .ops = ops,
@@ -442,7 +437,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nod void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .hwirq_max = max_irq, .direct_max = max_irq, .ops = ops,
@@ -462,7 +457,7 @@ static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .hwirq_max = ~0U , .ops = ops, .host_data = host_data,
@@ -611,7 +606,7 @@ static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *par void *host_data) {return irq_domain_create_hierarchy (parent, flags, size, -of_node_to_fwnode (node), +of_fwnode_handle (node), ops, host_data); }
@@ -755,6 +750,12 @@ static inline void msi_device_domain_free_wired(struct irq_domain *domain, unsig }#endif +/* Deprecated functions. Will be removed in the merge window */ +static inline struct fwnode_handle *of_node_to_fwnode (struct device_node *node) +{ +return node ? &node->fwnode :NULL ; +} +#else /* CONFIG_IRQ_DOMAIN */ static inline void irq_dispose_mapping (unsigned int virq) { } static inline struct irq_domain *irq_find_matching_fwnode(
kernel/irq/irqdomain.c +2 -2
@@ -502,7 +502,7 @@ struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,const struct irq_domain_ops *ops, void *host_data) { - return irq_domain_create_legacy(of_node_to_fwnode(of_node), size, + return irq_domain_create_legacy(of_fwnode_handle(of_node), size,first_irq ,first_hwirq ,ops ,host_data ); }EXPORT_SYMBOL_GPL (irq_domain_add_legacy);
@@ -885,7 +885,7 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args, {int i; - fwspec->fwnode =of_node_to_fwnode (np); + fwspec->fwnode =of_fwnode_handle (np); fwspec->param_count = count;for (i =0 ; i < count; i++)
[tip: irq/cleanups] irqdomain: Drop of_node_to_fwnode()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: e847a847aea5728dfcd13b558b9d82b79f9a85c7 Gitweb: https://git.kernel.org/tip/e847a847aea5728dfcd13b558b9d82b79f9a85c7 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:04 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:08 +02:00
irqdomain: Drop of_node_to_fwnode()
All uses of of_node_to_fwnode() in non-irqdomain code were changed to "officially" defined of_fwnode_handle(). Therefore, the former can be dropped along with the last uses in the irqdomain code.
Due to merge logistics the inline cannot be dropped immediately. Move it to a deprecated section, which will be removed during the merge window.
[ tglx: Handle merge logistics ]
--- include/linux/irqdomain.h | 23 ++++++++++++----------- kernel/irq/irqdomain.c | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-)
include/linux/irqdomain.h +12 -11
@@ -358,11 +358,6 @@ int irq_domain_alloc_descs(int virq, unsigned int nr_irqs, irq_hw_number_t hwirq, int node, const struct irq_affinity_desc *affinity); -static inline struct fwnode_handle *of_node_to_fwnode (struct device_node *node) -{ -return node ? &node->fwnode :NULL ; -} -extern const struct fwnode_operations irqchip_fwnode_ops;static inline bool is_fwnode_irqchip (const struct fwnode_handle *fwnode)
@@ -387,7 +382,7 @@ struct irq_domain *irq_find_matching_fwnode(struct fwnode_handle *fwnode,static inline struct irq_domain *irq_find_matching_host (struct device_node *node,enum irq_domain_bus_token bus_token) { -return irq_find_matching_fwnode (of_node_to_fwnode (node), bus_token); +return irq_find_matching_fwnode (of_fwnode_handle (node), bus_token); }static inline struct irq_domain *irq_find_host (struct device_node *node)
@@ -407,7 +402,7 @@ static inline struct irq_domain *irq_domain_add_simple(struct device_node *of_noconst struct irq_domain_ops *ops, void *host_data) { - return irq_domain_create_simple(of_node_to_fwnode(of_node), size, first_irq, ops, host_data); + return irq_domain_create_simple(of_fwnode_handle(of_node), size, first_irq, ops, host_data); }/**
@@ -423,7 +418,7 @@ static inline struct irq_domain *irq_domain_add_linear(struct device_node *of_no void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .size = size, .hwirq_max = size, .ops = ops,
@@ -442,7 +437,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nod void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .hwirq_max = max_irq, .direct_max = max_irq, .ops = ops,
@@ -462,7 +457,7 @@ static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node void *host_data) {struct irq_domain_info info = { - .fwnode =of_node_to_fwnode (of_node), + .fwnode =of_fwnode_handle (of_node), .hwirq_max = ~0U , .ops = ops, .host_data = host_data,
@@ -611,7 +606,7 @@ static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *par void *host_data) {return irq_domain_create_hierarchy (parent, flags, size, -of_node_to_fwnode (node), +of_fwnode_handle (node), ops, host_data); }
@@ -755,6 +750,12 @@ static inline void msi_device_domain_free_wired(struct irq_domain *domain, unsig }#endif +/* Deprecated functions. Will be removed in the merge window */ +static inline struct fwnode_handle *of_node_to_fwnode (struct device_node *node) +{ +return node ? &node->fwnode :NULL ; +} +#else /* CONFIG_IRQ_DOMAIN */ static inline void irq_dispose_mapping (unsigned int virq) { } static inline struct irq_domain *irq_find_matching_fwnode(
kernel/irq/irqdomain.c +2 -2
@@ -502,7 +502,7 @@ struct irq_domain *irq_domain_add_legacy(struct device_node *of_node,const struct irq_domain_ops *ops, void *host_data) { - return irq_domain_create_legacy(of_node_to_fwnode(of_node), size, + return irq_domain_create_legacy(of_fwnode_handle(of_node), size,first_irq ,first_hwirq ,ops ,host_data ); }EXPORT_SYMBOL_GPL (irq_domain_add_legacy);
@@ -885,7 +885,7 @@ void of_phandle_args_to_fwspec(struct device_node *np, const u32 *args, {int i; - fwspec->fwnode =of_node_to_fwnode (np); + fwspec->fwnode =of_fwnode_handle (np); fwspec->param_count = count;for (i =0 ; i < count; i++)
PATCH v2 12/57 irqdomain: Make irq_domain_create_hierarchy() an inline
In reply to Jiri Slaby (SUSE)There is no reason to export the function as an extra symbol. It is simple enough and is just a wrapper to already exported functions.
Therefore, switch the exported function to an inline.
--- include/linux/irqdomain.h | 45 +++++++++++++++++++++++++++++++++------ kernel/irq/irqdomain.c | 41 ----------------------------------- 2 files changed, 39 insertions(+), 47 deletions(-)
include/linux/irqdomain.h +39 -6
@@ -591,12 +591,45 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, void *handler_data, const char *handler_name);void irq_domain_reset_irq_data (struct irq_data *irq_data);#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY -struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, -unsigned int flags, -unsigned int size, -struct fwnode_handle *fwnode, -const struct irq_domain_ops *ops, -void *host_data); +/** +* irq_domain_create_hierarchy - Add a irqdomain into the hierarchy +* @parent: Parent irq domain to associate with the new domain +* @flags: Irq domain flags associated to the domain +* @size: Size of the domain. See below +* @fwnode: Optional fwnode of the interrupt controller +* @ops: Pointer to the interrupt domain callbacks +* @host_data: Controller private data pointer +* +* If @size is 0 a tree domain is created, otherwise a linear domain. +* +* If successful the parent is associated to the new domain and the +* domain flags are set. +* Returns pointer to IRQ domain, or NULL on failure. +*/ +static inline struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, +unsigned int flags, +unsigned int size, +struct fwnode_handle *fwnode, +const struct irq_domain_ops *ops, +void *host_data) +{ +struct irq_domain_info info = { + .fwnode = fwnode, + .size = size, + .hwirq_max = size, + .ops = ops, + .host_data = host_data, + .domain_flags = flags, + .parent = parent, + }; +struct irq_domain *d; + +if (!info.size) + info.hwirq_max = ~0U ; + + d =irq_domain_instantiate (&info); +return IS_ERR (d) ?NULL : d; +} static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *parent, unsigned int flags,
kernel/irq/irqdomain.c +0 -41
47 lines not on this page · raw message
Signature · 1 line
2.49.0
Ilpo Järvinen
maintainerRe: [PATCH v2 12/57] irqdomain: Make irq_domain_create_hierarchy() an inline
Quoted 29 lines · Jiri Slaby (SUSE)
There is no reason to export the function as an extra symbol. It is simple enough and is just a wrapper to already exported functions.
Therefore, switch the exported function to an inline.
Signed-off-by Jiri Slaby (SUSE) <[email protected]>--- include/linux/irqdomain.h | 45 +++++++++++++++++++++++++++++++++------ kernel/irq/irqdomain.c | 41 ----------------------------------- 2 files changed, 39 insertions(+), 47 deletions(-)include/linux/irqdomain.h +4
-6@@ -591,12 +591,45 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, void *handler_data, const char *handler_name);void irq_domain_reset_irq_data (struct irq_data *irq_data);#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY -struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, -unsigned int flags, -unsigned int size, -struct fwnode_handle *fwnode, -const struct irq_domain_ops *ops, -void *host_data); +/** +* irq_domain_create_hierarchy - Add a irqdomain into the hierarchy +* @parent: Parent irq domain to associate with the new domain +* @flags: Irq domain flags associated to the domain
include/linux/irqdomain.h void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, · line 607
Quoted 10 lines
include/linux/irqdomain.h +10
-0+* @size: Size of the domain. See below +* @fwnode: Optional fwnode of the interrupt controller +* @ops: Pointer to the interrupt domain callbacks +* @host_data: Controller private data pointer +* +* If @size is 0 a tree domain is created, otherwise a linear domain. +* +* If successful the parent is associated to the new domain and the +* domain flags are set. +* Returns pointer to IRQ domain, or NULL on failure.
*
* Return: ...
...is what kerneldoc documentation suggest is the right formatting.
(I know that was just copied form the original comment.)
Quoted 81 lines
include/linux/irqdomain.h +25
-0+*/ +static inline struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, +unsigned int flags, +unsigned int size, +struct fwnode_handle *fwnode, +const struct irq_domain_ops *ops, +void *host_data) +{ +struct irq_domain_info info = { + .fwnode = fwnode, + .size = size, + .hwirq_max = size, + .ops = ops, + .host_data = host_data, + .domain_flags = flags, + .parent = parent, + }; +struct irq_domain *d; + +if (!info.size) + info.hwirq_max = ~0U ; + + d =irq_domain_instantiate (&info); +return IS_ERR (d) ?NULL : d; +} static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *parent, unsigned int flags,kernel/irq/irqdomain.c +0
-41@@ -1252,47 +1252,6 @@ void irq_domain_reset_irq_data(struct irq_data *irq_data)EXPORT_SYMBOL_GPL (irq_domain_reset_irq_data);#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY -/** -* irq_domain_create_hierarchy - Add a irqdomain into the hierarchy -* @parent: Parent irq domain to associate with the new domain -* @flags: Irq domain flags associated to the domain -* @size: Size of the domain. See below -* @fwnode: Optional fwnode of the interrupt controller -* @ops: Pointer to the interrupt domain callbacks -* @host_data: Controller private data pointer -* -* If @size is 0 a tree domain is created, otherwise a linear domain. -* -* If successful the parent is associated to the new domain and the -* domain flags are set. -* Returns pointer to IRQ domain, or NULL on failure. -*/ -struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, -unsigned int flags, -unsigned int size, -struct fwnode_handle *fwnode, -const struct irq_domain_ops *ops, -void *host_data) -{ -struct irq_domain_info info = { - .fwnode = fwnode, - .size = size, - .hwirq_max = size, - .ops = ops, - .host_data = host_data, - .domain_flags = flags, - .parent = parent, - }; -struct irq_domain *d; - -if (!info.size) - info.hwirq_max = ~0U ; - - d =irq_domain_instantiate (&info); -return IS_ERR (d) ?NULL : d; -} -EXPORT_SYMBOL_GPL (irq_domain_create_hierarchy); -static void irq_domain_insert_irq (int virq) {struct irq_data *data;
Signature · 1 line
i.
Re: [PATCH v2 12/57] irqdomain: Make irq_domain_create_hierarchy() an inline
Quoted 45 lines · Ilpo Järvinen
Quoted 29 lines · Jiri Slaby (SUSE)
There is no reason to export the function as an extra symbol. It is simple enough and is just a wrapper to already exported functions.
Therefore, switch the exported function to an inline.
Signed-off-by Jiri Slaby (SUSE) <[email protected]>--- include/linux/irqdomain.h | 45 +++++++++++++++++++++++++++++++++------ kernel/irq/irqdomain.c | 41 ----------------------------------- 2 files changed, 39 insertions(+), 47 deletions(-)include/linux/irqdomain.h +4
-6@@ -591,12 +591,45 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, void *handler_data, const char *handler_name);void irq_domain_reset_irq_data (struct irq_data *irq_data);#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY -struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, -unsigned int flags, -unsigned int size, -struct fwnode_handle *fwnode, -const struct irq_domain_ops *ops, -void *host_data); +/** +* irq_domain_create_hierarchy - Add a irqdomain into the hierarchy +* @parent: Parent irq domain to associate with the new domain +* @flags: Irq domain flags associated to the domain include/linux/irqdomain.h void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, · line 607
Quoted 10 lines
include/linux/irqdomain.h +10
-0+* @size: Size of the domain. See below +* @fwnode: Optional fwnode of the interrupt controller +* @ops: Pointer to the interrupt domain callbacks +* @host_data: Controller private data pointer +* +* If @size is 0 a tree domain is created, otherwise a linear domain. +* +* If successful the parent is associated to the new domain and the +* domain flags are set. +* Returns pointer to IRQ domain, or NULL on failure. *
* Return: ...
Quoted 1 line
...is what kerneldoc documentation suggest is the right formatting.
Right, fixed.
thanks,
Signature · 2 lines
js suse labs
[tip: irq/cleanups] irqdomain: Make irq_domain_create_hierarchy() an inline
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 91453f6c42314c831c89c70ad20ebe68d886dc50 Gitweb: https://git.kernel.org/tip/91453f6c42314c831c89c70ad20ebe68d886dc50 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:05 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:04 +02:00
irqdomain: Make irq_domain_create_hierarchy() an inline
There is no reason to export the function as an extra symbol. It is simple enough and is just a wrapper to already exported functions.
Therefore, switch the exported function to an inline.
--- include/linux/irqdomain.h | 45 ++++++++++++++++++++++++++++++++------ kernel/irq/irqdomain.c | 41 +----------------------------------- 2 files changed, 39 insertions(+), 47 deletions(-)
include/linux/irqdomain.h +39 -6
@@ -591,12 +591,45 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, void *handler_data, const char *handler_name);void irq_domain_reset_irq_data (struct irq_data *irq_data);#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY -struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, -unsigned int flags, -unsigned int size, -struct fwnode_handle *fwnode, -const struct irq_domain_ops *ops, -void *host_data); +/** +* irq_domain_create_hierarchy - Add a irqdomain into the hierarchy +* @parent: Parent irq domain to associate with the new domain +* @flags: Irq domain flags associated to the domain +* @size: Size of the domain. See below +* @fwnode: Optional fwnode of the interrupt controller +* @ops: Pointer to the interrupt domain callbacks +* @host_data: Controller private data pointer +* +* If @size is 0 a tree domain is created, otherwise a linear domain. +* +* If successful the parent is associated to the new domain and the +* domain flags are set. +* Returns pointer to IRQ domain, or NULL on failure. +*/ +static inline struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, +unsigned int flags, +unsigned int size, +struct fwnode_handle *fwnode, +const struct irq_domain_ops *ops, +void *host_data) +{ +struct irq_domain_info info = { + .fwnode = fwnode, + .size = size, + .hwirq_max = size, + .ops = ops, + .host_data = host_data, + .domain_flags = flags, + .parent = parent, + }; +struct irq_domain *d; + +if (!info.size) + info.hwirq_max = ~0U ; + + d =irq_domain_instantiate (&info); +return IS_ERR (d) ?NULL : d; +} static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *parent, unsigned int flags,
kernel/irq/irqdomain.c +0 -41
47 lines not on this page · raw message
[tip: irq/cleanups] irqdomain: Make irq_domain_create_hierarchy() an inline
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 0b8018a1333cbccf37dceb2054be1c5db78eb953 Gitweb: https://git.kernel.org/tip/0b8018a1333cbccf37dceb2054be1c5db78eb953 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:05 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:21 +02:00
irqdomain: Make irq_domain_create_hierarchy() an inline
There is no reason to export the function as an extra symbol. It is simple enough and is just a wrapper to already exported functions.
Therefore, switch the exported function to an inline.
--- include/linux/irqdomain.h | 45 ++++++++++++++++++++++++++++++++------ kernel/irq/irqdomain.c | 41 +----------------------------------- 2 files changed, 39 insertions(+), 47 deletions(-)
include/linux/irqdomain.h +39 -6
@@ -591,12 +591,45 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, void *handler_data, const char *handler_name);void irq_domain_reset_irq_data (struct irq_data *irq_data);#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY -struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, -unsigned int flags, -unsigned int size, -struct fwnode_handle *fwnode, -const struct irq_domain_ops *ops, -void *host_data); +/** +* irq_domain_create_hierarchy - Add a irqdomain into the hierarchy +* @parent: Parent irq domain to associate with the new domain +* @flags: Irq domain flags associated to the domain +* @size: Size of the domain. See below +* @fwnode: Optional fwnode of the interrupt controller +* @ops: Pointer to the interrupt domain callbacks +* @host_data: Controller private data pointer +* +* If @size is 0 a tree domain is created, otherwise a linear domain. +* +* If successful the parent is associated to the new domain and the +* domain flags are set. +* Returns pointer to IRQ domain, or NULL on failure. +*/ +static inline struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, +unsigned int flags, +unsigned int size, +struct fwnode_handle *fwnode, +const struct irq_domain_ops *ops, +void *host_data) +{ +struct irq_domain_info info = { + .fwnode = fwnode, + .size = size, + .hwirq_max = size, + .ops = ops, + .host_data = host_data, + .domain_flags = flags, + .parent = parent, + }; +struct irq_domain *d; + +if (!info.size) + info.hwirq_max = ~0U ; + + d =irq_domain_instantiate (&info); +return IS_ERR (d) ?NULL : d; +} static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *parent, unsigned int flags,
kernel/irq/irqdomain.c +0 -41
47 lines not on this page · raw message
[tip: irq/cleanups] irqdomain: Make irq_domain_create_hierarchy() an inline
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: c7131b12080ad9c74eadd4f62386c8642168bec7 Gitweb: https://git.kernel.org/tip/c7131b12080ad9c74eadd4f62386c8642168bec7 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:05 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:08 +02:00
irqdomain: Make irq_domain_create_hierarchy() an inline
There is no reason to export the function as an extra symbol. It is simple enough and is just a wrapper to already exported functions.
Therefore, switch the exported function to an inline.
--- include/linux/irqdomain.h | 45 ++++++++++++++++++++++++++++++++------ kernel/irq/irqdomain.c | 41 +----------------------------------- 2 files changed, 39 insertions(+), 47 deletions(-)
include/linux/irqdomain.h +39 -6
@@ -591,12 +591,45 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, void *handler_data, const char *handler_name);void irq_domain_reset_irq_data (struct irq_data *irq_data);#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY -struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, -unsigned int flags, -unsigned int size, -struct fwnode_handle *fwnode, -const struct irq_domain_ops *ops, -void *host_data); +/** +* irq_domain_create_hierarchy - Add a irqdomain into the hierarchy +* @parent: Parent irq domain to associate with the new domain +* @flags: Irq domain flags associated to the domain +* @size: Size of the domain. See below +* @fwnode: Optional fwnode of the interrupt controller +* @ops: Pointer to the interrupt domain callbacks +* @host_data: Controller private data pointer +* +* If @size is 0 a tree domain is created, otherwise a linear domain. +* +* If successful the parent is associated to the new domain and the +* domain flags are set. +* Returns pointer to IRQ domain, or NULL on failure. +*/ +static inline struct irq_domain *irq_domain_create_hierarchy (struct irq_domain *parent, +unsigned int flags, +unsigned int size, +struct fwnode_handle *fwnode, +const struct irq_domain_ops *ops, +void *host_data) +{ +struct irq_domain_info info = { + .fwnode = fwnode, + .size = size, + .hwirq_max = size, + .ops = ops, + .host_data = host_data, + .domain_flags = flags, + .parent = parent, + }; +struct irq_domain *d; + +if (!info.size) + info.hwirq_max = ~0U ; + + d =irq_domain_instantiate (&info); +return IS_ERR (d) ?NULL : d; +} static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *parent, unsigned int flags,
kernel/irq/irqdomain.c +0 -41
47 lines not on this page · raw message
PATCH v2 13/57 irqdomain: arc: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
--- arch/arc/kernel/intc-arcv2.c | 2 +- arch/arc/kernel/intc-compact.c | 5 +++-- arch/arc/kernel/mcip.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)
arch/arc/kernel/intc-arcv2.c +1 -1
@@ -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" ); - root_domain =irq_domain_add_linear (intc, nr_cpu_irqs, &arcv2_irq_ops,NULL ); + root_domain =irq_domain_create_linear (of_fwnode_handle (intc), nr_cpu_irqs, &arcv2_irq_ops,NULL );if (!root_domain)panic ("root irq domain not avail\n" );
arch/arc/kernel/intc-compact.c +3 -2
@@ -112,8 +112,9 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)if (parent)panic ("DeviceTree incore intc not a root irq controller\n" ); - root_domain =irq_domain_add_linear (intc,NR_CPU_IRQS , - &arc_intc_domain_ops,NULL ); + root_domain =irq_domain_create_linear (of_fwnode_handle (intc), +NR_CPU_IRQS , + &arc_intc_domain_ops,NULL );if (!root_domain)panic ("root irq domain not avail\n" );
arch/arc/kernel/mcip.c +2 -1
@@ -391,7 +391,8 @@ idu_of_init(struct device_node *intc, struct device_node *parent)pr_info ("MCIP: IDU supports %u common irqs\n" , nr_irqs); - domain =irq_domain_add_linear (intc, nr_irqs, &idu_irq_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (intc), nr_irqs, + &idu_irq_ops,NULL );/* Parent interrupts (core-intc) are already mapped */
Signature · 1 line
2.49.0
[tip: irq/cleanups] ARC: Switch to irq_domain_create_linear()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 12fc10f71905ebdc3ca6620f173c517d5f059d8e Gitweb: https://git.kernel.org/tip/12fc10f71905ebdc3ca6620f173c517d5f059d8e Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:06 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:04 +02:00
ARC: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- arch/arc/kernel/intc-arcv2.c | 2 +- arch/arc/kernel/intc-compact.c | 5 +++-- arch/arc/kernel/mcip.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)
arch/arc/kernel/intc-arcv2.c +1 -1
@@ -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" ); - root_domain =irq_domain_add_linear (intc, nr_cpu_irqs, &arcv2_irq_ops,NULL ); + root_domain =irq_domain_create_linear (of_fwnode_handle (intc), nr_cpu_irqs, &arcv2_irq_ops,NULL );if (!root_domain)panic ("root irq domain not avail\n" );
arch/arc/kernel/intc-compact.c +3 -2
@@ -112,8 +112,9 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)if (parent)panic ("DeviceTree incore intc not a root irq controller\n" ); - root_domain =irq_domain_add_linear (intc,NR_CPU_IRQS , - &arc_intc_domain_ops,NULL ); + root_domain =irq_domain_create_linear (of_fwnode_handle (intc), +NR_CPU_IRQS , + &arc_intc_domain_ops,NULL );if (!root_domain)panic ("root irq domain not avail\n" );
arch/arc/kernel/mcip.c +2 -1
@@ -391,7 +391,8 @@ idu_of_init(struct device_node *intc, struct device_node *parent)pr_info ("MCIP: IDU supports %u common irqs\n" , nr_irqs); - domain =irq_domain_add_linear (intc, nr_irqs, &idu_irq_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (intc), nr_irqs, + &idu_irq_ops,NULL );/* Parent interrupts (core-intc) are already mapped */
[tip: irq/cleanups] ARC: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 8afd2253df98c9d3d1baae662f51bdea17fd101e Gitweb: https://git.kernel.org/tip/8afd2253df98c9d3d1baae662f51bdea17fd101e Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:06 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
ARC: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- arch/arc/kernel/intc-arcv2.c | 2 +- arch/arc/kernel/intc-compact.c | 5 +++-- arch/arc/kernel/mcip.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)
arch/arc/kernel/intc-arcv2.c +1 -1
@@ -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" ); - root_domain =irq_domain_add_linear (intc, nr_cpu_irqs, &arcv2_irq_ops,NULL ); + root_domain =irq_domain_create_linear (of_fwnode_handle (intc), nr_cpu_irqs, &arcv2_irq_ops,NULL );if (!root_domain)panic ("root irq domain not avail\n" );
arch/arc/kernel/intc-compact.c +3 -2
@@ -112,8 +112,9 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)if (parent)panic ("DeviceTree incore intc not a root irq controller\n" ); - root_domain =irq_domain_add_linear (intc,NR_CPU_IRQS , - &arc_intc_domain_ops,NULL ); + root_domain =irq_domain_create_linear (of_fwnode_handle (intc), +NR_CPU_IRQS , + &arc_intc_domain_ops,NULL );if (!root_domain)panic ("root irq domain not avail\n" );
arch/arc/kernel/mcip.c +2 -1
@@ -391,7 +391,8 @@ idu_of_init(struct device_node *intc, struct device_node *parent)pr_info ("MCIP: IDU supports %u common irqs\n" , nr_irqs); - domain =irq_domain_add_linear (intc, nr_irqs, &idu_irq_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (intc), nr_irqs, + &idu_irq_ops,NULL );/* Parent interrupts (core-intc) are already mapped */
[tip: irq/cleanups] ARC: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 80f2405bf204c6dd5ccfad8a96ebebe818f01214 Gitweb: https://git.kernel.org/tip/80f2405bf204c6dd5ccfad8a96ebebe818f01214 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:06 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:08 +02:00
ARC: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- arch/arc/kernel/intc-arcv2.c | 2 +- arch/arc/kernel/intc-compact.c | 5 +++-- arch/arc/kernel/mcip.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)
arch/arc/kernel/intc-arcv2.c +1 -1
@@ -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" ); - root_domain =irq_domain_add_linear (intc, nr_cpu_irqs, &arcv2_irq_ops,NULL ); + root_domain =irq_domain_create_linear (of_fwnode_handle (intc), nr_cpu_irqs, &arcv2_irq_ops,NULL );if (!root_domain)panic ("root irq domain not avail\n" );
arch/arc/kernel/intc-compact.c +3 -2
@@ -112,8 +112,9 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)if (parent)panic ("DeviceTree incore intc not a root irq controller\n" ); - root_domain =irq_domain_add_linear (intc,NR_CPU_IRQS , - &arc_intc_domain_ops,NULL ); + root_domain =irq_domain_create_linear (of_fwnode_handle (intc), +NR_CPU_IRQS , + &arc_intc_domain_ops,NULL );if (!root_domain)panic ("root irq domain not avail\n" );
arch/arc/kernel/mcip.c +2 -1
@@ -391,7 +391,8 @@ idu_of_init(struct device_node *intc, struct device_node *parent)pr_info ("MCIP: IDU supports %u common irqs\n" , nr_irqs); - domain =irq_domain_add_linear (intc, nr_irqs, &idu_irq_ops,NULL ); + domain =irq_domain_create_linear (of_fwnode_handle (intc), nr_irqs, + &idu_irq_ops,NULL );/* Parent interrupts (core-intc) are already mapped */
PATCH v2 14/57 irqdomain: arm: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
--- arch/arm/common/sa1111.c | 6 +++--- arch/arm/mach-exynos/suspend.c | 5 ++--- arch/arm/mach-imx/avic.c | 4 ++-- arch/arm/mach-imx/gpc.c | 5 ++--- arch/arm/mach-imx/tzic.c | 4 ++-- arch/arm/mach-omap1/irq.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 5 ++--- arch/arm/mach-pxa/irq.c | 5 ++--- arch/arm/plat-orion/gpio.c | 12 ++++++------ 9 files changed, 22 insertions(+), 27 deletions(-)
arch/arm/common/sa1111.c +3 -3
@@ -416,9 +416,9 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)writel_relaxed (~0 , irqbase +SA1111_INTSTATCLR0 );writel_relaxed (~0 , irqbase +SA1111_INTSTATCLR1 ); - sachip->irqdomain =irq_domain_add_linear (NULL ,SA1111_IRQ_NR , - &sa1111_irqdomain_ops, - sachip); + sachip->irqdomain =irq_domain_create_linear (NULL ,SA1111_IRQ_NR , + &sa1111_irqdomain_ops, + sachip);if (!sachip->irqdomain) {irq_free_descs (sachip->irq_base,SA1111_IRQ_NR );return -ENOMEM ;
arch/arm/mach-exynos/suspend.c +2 -3
@@ -209,9 +209,8 @@ static int __init exynos_pmu_irq_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , - node, &exynos_pmu_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &exynos_pmu_domain_ops,NULL );if (!domain) {iounmap (pmu_base_addr); pmu_base_addr =NULL ;
arch/arm/mach-imx/avic.c +2 -2
@@ -201,8 +201,8 @@ static void __init mxc_init_irq(void __iomem *irqbase)WARN_ON (irq_base <0 ); np =of_find_compatible_node (NULL ,NULL ,"fsl,avic" ); - domain =irq_domain_add_legacy (np,AVIC_NUM_IRQS , irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (np),AVIC_NUM_IRQS , irq_base,0 , + &irq_domain_simple_ops,NULL );WARN_ON (!domain);for (i =0 ; i <AVIC_NUM_IRQS /32 ; i++, irq_base +=32 )
arch/arm/mach-imx/gpc.c +2 -3
@@ -245,9 +245,8 @@ static int __init imx_gpc_init(struct device_node *node,if (WARN_ON (!gpc_base))return -ENOMEM ; - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &imx_gpc_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS ,of_fwnode_handle (node), + &imx_gpc_domain_ops,NULL );if (!domain) {iounmap (gpc_base);return -ENOMEM ;
arch/arm/mach-imx/tzic.c +2 -2
@@ -175,8 +175,8 @@ static int __init tzic_init_dt(struct device_node *np, struct device_node *p) irq_base =irq_alloc_descs (-1 ,0 ,TZIC_NUM_IRQS ,numa_node_id ());WARN_ON (irq_base <0 ); - domain =irq_domain_add_legacy (np,TZIC_NUM_IRQS , irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (np),TZIC_NUM_IRQS , irq_base,0 , + &irq_domain_simple_ops,NULL );WARN_ON (!domain);for (i =0 ; i <4 ; i++, irq_base +=32 )
arch/arm/mach-omap1/irq.c +1 -2
@@ -220,8 +220,7 @@ void __init omap1_init_irq(void) omap_l2_irq = irq_base; omap_l2_irq -=NR_IRQS_LEGACY ; - domain =irq_domain_add_legacy (NULL , nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (NULL , nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );pr_info ("Total of %lu interrupts in %i interrupt banks\n" , nr_irqs, irq_bank_count);
arch/arm/mach-omap2/omap-wakeupgen.c +2 -3
@@ -585,9 +585,8 @@ static int __init wakeupgen_init(struct device_node *node, wakeupgen_ops = &am43xx_wakeupgen_ops; } - domain =irq_domain_add_hierarchy (parent_domain,0 , max_irqs, - node, &wakeupgen_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , max_irqs,of_fwnode_handle (node), + &wakeupgen_domain_ops,NULL );if (!domain) {iounmap (wakeupgen_base);return -ENOMEM ;
arch/arm/mach-pxa/irq.c +2 -3
@@ -147,9 +147,8 @@ pxa_init_irq_common(struct device_node *node, int irq_nr,int n; pxa_internal_irq_nr = irq_nr; - pxa_irq_domain =irq_domain_add_legacy (node, irq_nr, -PXA_IRQ (0 ),0 , - &pxa_irq_ops,NULL ); + pxa_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), irq_nr,PXA_IRQ (0 ),0 , + &pxa_irq_ops,NULL );if (!pxa_irq_domain)panic ("Unable to add PXA IRQ domain\n" );irq_set_default_domain (pxa_irq_domain);
arch/arm/plat-orion/gpio.c +6 -6
@@ -602,12 +602,12 @@ void __init orion_gpio_init(int gpio_base, int ngpio, IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);/* Setup irq domain on top of the generic chip. */ - ochip->domain =irq_domain_add_legacy (NULL , - ochip->chip.ngpio, - ochip->secondary_irq_base, - ochip->secondary_irq_base, - &irq_domain_simple_ops, - ochip); + ochip->domain =irq_domain_create_legacy (NULL , + ochip->chip.ngpio, + ochip->secondary_irq_base, + ochip->secondary_irq_base, + &irq_domain_simple_ops, + ochip);if (!ochip->domain)panic ("%s: couldn't allocate irq domain (DT).\n" , ochip->chip.label);
Signature · 1 line
2.49.0
[tip: irq/cleanups] ARM: Switch to irq_domain_create_*()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 2b3ff354e88533de20f6c3e10c7e86da4f3b2620 Gitweb: https://git.kernel.org/tip/2b3ff354e88533de20f6c3e10c7e86da4f3b2620 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:07 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:04 +02:00
ARM: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- arch/arm/common/sa1111.c | 6 +++--- arch/arm/mach-exynos/suspend.c | 5 ++--- arch/arm/mach-imx/avic.c | 4 ++-- arch/arm/mach-imx/gpc.c | 5 ++--- arch/arm/mach-imx/tzic.c | 4 ++-- arch/arm/mach-omap1/irq.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 5 ++--- arch/arm/mach-pxa/irq.c | 5 ++--- arch/arm/plat-orion/gpio.c | 12 ++++++------ 9 files changed, 22 insertions(+), 27 deletions(-)
arch/arm/common/sa1111.c +3 -3
@@ -416,9 +416,9 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)writel_relaxed (~0 , irqbase +SA1111_INTSTATCLR0 );writel_relaxed (~0 , irqbase +SA1111_INTSTATCLR1 ); - sachip->irqdomain =irq_domain_add_linear (NULL ,SA1111_IRQ_NR , - &sa1111_irqdomain_ops, - sachip); + sachip->irqdomain =irq_domain_create_linear (NULL ,SA1111_IRQ_NR , + &sa1111_irqdomain_ops, + sachip);if (!sachip->irqdomain) {irq_free_descs (sachip->irq_base,SA1111_IRQ_NR );return -ENOMEM ;
arch/arm/mach-exynos/suspend.c +2 -3
@@ -209,9 +209,8 @@ static int __init exynos_pmu_irq_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , - node, &exynos_pmu_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &exynos_pmu_domain_ops,NULL );if (!domain) {iounmap (pmu_base_addr); pmu_base_addr =NULL ;
arch/arm/mach-imx/avic.c +2 -2
@@ -201,8 +201,8 @@ static void __init mxc_init_irq(void __iomem *irqbase)WARN_ON (irq_base <0 ); np =of_find_compatible_node (NULL ,NULL ,"fsl,avic" ); - domain =irq_domain_add_legacy (np,AVIC_NUM_IRQS , irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (np),AVIC_NUM_IRQS , irq_base,0 , + &irq_domain_simple_ops,NULL );WARN_ON (!domain);for (i =0 ; i <AVIC_NUM_IRQS /32 ; i++, irq_base +=32 )
arch/arm/mach-imx/gpc.c +2 -3
@@ -245,9 +245,8 @@ static int __init imx_gpc_init(struct device_node *node,if (WARN_ON (!gpc_base))return -ENOMEM ; - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &imx_gpc_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS ,of_fwnode_handle (node), + &imx_gpc_domain_ops,NULL );if (!domain) {iounmap (gpc_base);return -ENOMEM ;
arch/arm/mach-imx/tzic.c +2 -2
@@ -175,8 +175,8 @@ static int __init tzic_init_dt(struct device_node *np, struct device_node *p) irq_base =irq_alloc_descs (-1 ,0 ,TZIC_NUM_IRQS ,numa_node_id ());WARN_ON (irq_base <0 ); - domain =irq_domain_add_legacy (np,TZIC_NUM_IRQS , irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (np),TZIC_NUM_IRQS , irq_base,0 , + &irq_domain_simple_ops,NULL );WARN_ON (!domain);for (i =0 ; i <4 ; i++, irq_base +=32 )
arch/arm/mach-omap1/irq.c +1 -2
@@ -220,8 +220,7 @@ void __init omap1_init_irq(void) omap_l2_irq = irq_base; omap_l2_irq -=NR_IRQS_LEGACY ; - domain =irq_domain_add_legacy (NULL , nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (NULL , nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );pr_info ("Total of %lu interrupts in %i interrupt banks\n" , nr_irqs, irq_bank_count);
arch/arm/mach-omap2/omap-wakeupgen.c +2 -3
@@ -585,9 +585,8 @@ static int __init wakeupgen_init(struct device_node *node, wakeupgen_ops = &am43xx_wakeupgen_ops; } - domain =irq_domain_add_hierarchy (parent_domain,0 , max_irqs, - node, &wakeupgen_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , max_irqs,of_fwnode_handle (node), + &wakeupgen_domain_ops,NULL );if (!domain) {iounmap (wakeupgen_base);return -ENOMEM ;
arch/arm/mach-pxa/irq.c +2 -3
@@ -147,9 +147,8 @@ pxa_init_irq_common(struct device_node *node, int irq_nr,int n; pxa_internal_irq_nr = irq_nr; - pxa_irq_domain =irq_domain_add_legacy (node, irq_nr, -PXA_IRQ (0 ),0 , - &pxa_irq_ops,NULL ); + pxa_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), irq_nr,PXA_IRQ (0 ),0 , + &pxa_irq_ops,NULL );if (!pxa_irq_domain)panic ("Unable to add PXA IRQ domain\n" );irq_set_default_domain (pxa_irq_domain);
arch/arm/plat-orion/gpio.c +6 -6
@@ -602,12 +602,12 @@ void __init orion_gpio_init(int gpio_base, int ngpio, IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);/* Setup irq domain on top of the generic chip. */ - ochip->domain =irq_domain_add_legacy (NULL , - ochip->chip.ngpio, - ochip->secondary_irq_base, - ochip->secondary_irq_base, - &irq_domain_simple_ops, - ochip); + ochip->domain =irq_domain_create_legacy (NULL , + ochip->chip.ngpio, + ochip->secondary_irq_base, + ochip->secondary_irq_base, + &irq_domain_simple_ops, + ochip);if (!ochip->domain)panic ("%s: couldn't allocate irq domain (DT).\n" , ochip->chip.label);
[tip: irq/cleanups] ARM: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: e848923ad13b238990a7b253d28934db3d6f1ab0 Gitweb: https://git.kernel.org/tip/e848923ad13b238990a7b253d28934db3d6f1ab0 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:07 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
ARM: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- arch/arm/common/sa1111.c | 6 +++--- arch/arm/mach-exynos/suspend.c | 5 ++--- arch/arm/mach-imx/avic.c | 4 ++-- arch/arm/mach-imx/gpc.c | 5 ++--- arch/arm/mach-imx/tzic.c | 4 ++-- arch/arm/mach-omap1/irq.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 5 ++--- arch/arm/mach-pxa/irq.c | 5 ++--- arch/arm/plat-orion/gpio.c | 12 ++++++------ 9 files changed, 22 insertions(+), 27 deletions(-)
arch/arm/common/sa1111.c +3 -3
@@ -416,9 +416,9 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)writel_relaxed (~0 , irqbase +SA1111_INTSTATCLR0 );writel_relaxed (~0 , irqbase +SA1111_INTSTATCLR1 ); - sachip->irqdomain =irq_domain_add_linear (NULL ,SA1111_IRQ_NR , - &sa1111_irqdomain_ops, - sachip); + sachip->irqdomain =irq_domain_create_linear (NULL ,SA1111_IRQ_NR , + &sa1111_irqdomain_ops, + sachip);if (!sachip->irqdomain) {irq_free_descs (sachip->irq_base,SA1111_IRQ_NR );return -ENOMEM ;
arch/arm/mach-exynos/suspend.c +2 -3
@@ -209,9 +209,8 @@ static int __init exynos_pmu_irq_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , - node, &exynos_pmu_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &exynos_pmu_domain_ops,NULL );if (!domain) {iounmap (pmu_base_addr); pmu_base_addr =NULL ;
arch/arm/mach-imx/avic.c +2 -2
@@ -201,8 +201,8 @@ static void __init mxc_init_irq(void __iomem *irqbase)WARN_ON (irq_base <0 ); np =of_find_compatible_node (NULL ,NULL ,"fsl,avic" ); - domain =irq_domain_add_legacy (np,AVIC_NUM_IRQS , irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (np),AVIC_NUM_IRQS , irq_base,0 , + &irq_domain_simple_ops,NULL );WARN_ON (!domain);for (i =0 ; i <AVIC_NUM_IRQS /32 ; i++, irq_base +=32 )
arch/arm/mach-imx/gpc.c +2 -3
@@ -245,9 +245,8 @@ static int __init imx_gpc_init(struct device_node *node,if (WARN_ON (!gpc_base))return -ENOMEM ; - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &imx_gpc_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS ,of_fwnode_handle (node), + &imx_gpc_domain_ops,NULL );if (!domain) {iounmap (gpc_base);return -ENOMEM ;
arch/arm/mach-imx/tzic.c +2 -2
@@ -175,8 +175,8 @@ static int __init tzic_init_dt(struct device_node *np, struct device_node *p) irq_base =irq_alloc_descs (-1 ,0 ,TZIC_NUM_IRQS ,numa_node_id ());WARN_ON (irq_base <0 ); - domain =irq_domain_add_legacy (np,TZIC_NUM_IRQS , irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (np),TZIC_NUM_IRQS , irq_base,0 , + &irq_domain_simple_ops,NULL );WARN_ON (!domain);for (i =0 ; i <4 ; i++, irq_base +=32 )
arch/arm/mach-omap1/irq.c +1 -2
@@ -220,8 +220,7 @@ void __init omap1_init_irq(void) omap_l2_irq = irq_base; omap_l2_irq -=NR_IRQS_LEGACY ; - domain =irq_domain_add_legacy (NULL , nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (NULL , nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );pr_info ("Total of %lu interrupts in %i interrupt banks\n" , nr_irqs, irq_bank_count);
arch/arm/mach-omap2/omap-wakeupgen.c +2 -3
@@ -585,9 +585,8 @@ static int __init wakeupgen_init(struct device_node *node, wakeupgen_ops = &am43xx_wakeupgen_ops; } - domain =irq_domain_add_hierarchy (parent_domain,0 , max_irqs, - node, &wakeupgen_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , max_irqs,of_fwnode_handle (node), + &wakeupgen_domain_ops,NULL );if (!domain) {iounmap (wakeupgen_base);return -ENOMEM ;
arch/arm/mach-pxa/irq.c +2 -3
@@ -147,9 +147,8 @@ pxa_init_irq_common(struct device_node *node, int irq_nr,int n; pxa_internal_irq_nr = irq_nr; - pxa_irq_domain =irq_domain_add_legacy (node, irq_nr, -PXA_IRQ (0 ),0 , - &pxa_irq_ops,NULL ); + pxa_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), irq_nr,PXA_IRQ (0 ),0 , + &pxa_irq_ops,NULL );if (!pxa_irq_domain)panic ("Unable to add PXA IRQ domain\n" );irq_set_default_domain (pxa_irq_domain);
arch/arm/plat-orion/gpio.c +6 -6
@@ -602,12 +602,12 @@ void __init orion_gpio_init(int gpio_base, int ngpio, IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);/* Setup irq domain on top of the generic chip. */ - ochip->domain =irq_domain_add_legacy (NULL , - ochip->chip.ngpio, - ochip->secondary_irq_base, - ochip->secondary_irq_base, - &irq_domain_simple_ops, - ochip); + ochip->domain =irq_domain_create_legacy (NULL , + ochip->chip.ngpio, + ochip->secondary_irq_base, + ochip->secondary_irq_base, + &irq_domain_simple_ops, + ochip);if (!ochip->domain)panic ("%s: couldn't allocate irq domain (DT).\n" , ochip->chip.label);
[tip: irq/cleanups] ARM: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 4dcb0045a363b9d32472f527bd06a6816e6a4275 Gitweb: https://git.kernel.org/tip/4dcb0045a363b9d32472f527bd06a6816e6a4275 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:07 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:08 +02:00
ARM: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- arch/arm/common/sa1111.c | 6 +++--- arch/arm/mach-exynos/suspend.c | 5 ++--- arch/arm/mach-imx/avic.c | 4 ++-- arch/arm/mach-imx/gpc.c | 5 ++--- arch/arm/mach-imx/tzic.c | 4 ++-- arch/arm/mach-omap1/irq.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 5 ++--- arch/arm/mach-pxa/irq.c | 5 ++--- arch/arm/plat-orion/gpio.c | 12 ++++++------ 9 files changed, 22 insertions(+), 27 deletions(-)
arch/arm/common/sa1111.c +3 -3
@@ -416,9 +416,9 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)writel_relaxed (~0 , irqbase +SA1111_INTSTATCLR0 );writel_relaxed (~0 , irqbase +SA1111_INTSTATCLR1 ); - sachip->irqdomain =irq_domain_add_linear (NULL ,SA1111_IRQ_NR , - &sa1111_irqdomain_ops, - sachip); + sachip->irqdomain =irq_domain_create_linear (NULL ,SA1111_IRQ_NR , + &sa1111_irqdomain_ops, + sachip);if (!sachip->irqdomain) {irq_free_descs (sachip->irq_base,SA1111_IRQ_NR );return -ENOMEM ;
arch/arm/mach-exynos/suspend.c +2 -3
@@ -209,9 +209,8 @@ static int __init exynos_pmu_irq_init(struct device_node *node,return -ENOMEM ; } - domain =irq_domain_add_hierarchy (parent_domain,0 ,0 , - node, &exynos_pmu_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,0 ,of_fwnode_handle (node), + &exynos_pmu_domain_ops,NULL );if (!domain) {iounmap (pmu_base_addr); pmu_base_addr =NULL ;
arch/arm/mach-imx/avic.c +2 -2
@@ -201,8 +201,8 @@ static void __init mxc_init_irq(void __iomem *irqbase)WARN_ON (irq_base <0 ); np =of_find_compatible_node (NULL ,NULL ,"fsl,avic" ); - domain =irq_domain_add_legacy (np,AVIC_NUM_IRQS , irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (np),AVIC_NUM_IRQS , irq_base,0 , + &irq_domain_simple_ops,NULL );WARN_ON (!domain);for (i =0 ; i <AVIC_NUM_IRQS /32 ; i++, irq_base +=32 )
arch/arm/mach-imx/gpc.c +2 -3
@@ -245,9 +245,8 @@ static int __init imx_gpc_init(struct device_node *node,if (WARN_ON (!gpc_base))return -ENOMEM ; - domain =irq_domain_add_hierarchy (parent_domain,0 ,GPC_MAX_IRQS , - node, &imx_gpc_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 ,GPC_MAX_IRQS ,of_fwnode_handle (node), + &imx_gpc_domain_ops,NULL );if (!domain) {iounmap (gpc_base);return -ENOMEM ;
arch/arm/mach-imx/tzic.c +2 -2
@@ -175,8 +175,8 @@ static int __init tzic_init_dt(struct device_node *np, struct device_node *p) irq_base =irq_alloc_descs (-1 ,0 ,TZIC_NUM_IRQS ,numa_node_id ());WARN_ON (irq_base <0 ); - domain =irq_domain_add_legacy (np,TZIC_NUM_IRQS , irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (of_fwnode_handle (np),TZIC_NUM_IRQS , irq_base,0 , + &irq_domain_simple_ops,NULL );WARN_ON (!domain);for (i =0 ; i <4 ; i++, irq_base +=32 )
arch/arm/mach-omap1/irq.c +1 -2
@@ -220,8 +220,7 @@ void __init omap1_init_irq(void) omap_l2_irq = irq_base; omap_l2_irq -=NR_IRQS_LEGACY ; - domain =irq_domain_add_legacy (NULL , nr_irqs, irq_base,0 , - &irq_domain_simple_ops,NULL ); + domain =irq_domain_create_legacy (NULL , nr_irqs, irq_base,0 , &irq_domain_simple_ops,NULL );pr_info ("Total of %lu interrupts in %i interrupt banks\n" , nr_irqs, irq_bank_count);
arch/arm/mach-omap2/omap-wakeupgen.c +2 -3
@@ -585,9 +585,8 @@ static int __init wakeupgen_init(struct device_node *node, wakeupgen_ops = &am43xx_wakeupgen_ops; } - domain =irq_domain_add_hierarchy (parent_domain,0 , max_irqs, - node, &wakeupgen_domain_ops, -NULL ); + domain =irq_domain_create_hierarchy (parent_domain,0 , max_irqs,of_fwnode_handle (node), + &wakeupgen_domain_ops,NULL );if (!domain) {iounmap (wakeupgen_base);return -ENOMEM ;
arch/arm/mach-pxa/irq.c +2 -3
@@ -147,9 +147,8 @@ pxa_init_irq_common(struct device_node *node, int irq_nr,int n; pxa_internal_irq_nr = irq_nr; - pxa_irq_domain =irq_domain_add_legacy (node, irq_nr, -PXA_IRQ (0 ),0 , - &pxa_irq_ops,NULL ); + pxa_irq_domain =irq_domain_create_legacy (of_fwnode_handle (node), irq_nr,PXA_IRQ (0 ),0 , + &pxa_irq_ops,NULL );if (!pxa_irq_domain)panic ("Unable to add PXA IRQ domain\n" );irq_set_default_domain (pxa_irq_domain);
arch/arm/plat-orion/gpio.c +6 -6
@@ -602,12 +602,12 @@ void __init orion_gpio_init(int gpio_base, int ngpio, IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);/* Setup irq domain on top of the generic chip. */ - ochip->domain =irq_domain_add_legacy (NULL , - ochip->chip.ngpio, - ochip->secondary_irq_base, - ochip->secondary_irq_base, - &irq_domain_simple_ops, - ochip); + ochip->domain =irq_domain_create_legacy (NULL , + ochip->chip.ngpio, + ochip->secondary_irq_base, + ochip->secondary_irq_base, + &irq_domain_simple_ops, + ochip);if (!ochip->domain)panic ("%s: couldn't allocate irq domain (DT).\n" , ochip->chip.label);
PATCH v2 15/57 irqdomain: bus: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
--- drivers/bus/moxtet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bus/moxtet.c +3 -3
@@ -737,9 +737,9 @@ static int moxtet_irq_setup(struct moxtet *moxtet) {int i, ret; - moxtet->irq.domain =irq_domain_add_simple (moxtet->dev->of_node, -MOXTET_NIRQS ,0 , - &moxtet_irq_domain, moxtet); + moxtet->irq.domain =irq_domain_create_simple (of_fwnode_handle (moxtet->dev->of_node), +MOXTET_NIRQS ,0 , + &moxtet_irq_domain, moxtet);if (moxtet->irq.domain ==NULL ) {dev_err (moxtet->dev,"Could not add IRQ domain\n" );return -ENOMEM ;
Signature · 1 line
2.49.0
[tip: irq/cleanups] bus: moxtet: Switch to irq_domain_create_simple()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 35453b137783ea3721c27566f56e8edb4bdb2736 Gitweb: https://git.kernel.org/tip/35453b137783ea3721c27566f56e8edb4bdb2736 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:08 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:04 +02:00
bus: moxtet: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/bus/moxtet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bus/moxtet.c +3 -3
@@ -737,9 +737,9 @@ static int moxtet_irq_setup(struct moxtet *moxtet) {int i, ret; - moxtet->irq.domain =irq_domain_add_simple (moxtet->dev->of_node, -MOXTET_NIRQS ,0 , - &moxtet_irq_domain, moxtet); + moxtet->irq.domain =irq_domain_create_simple (of_fwnode_handle (moxtet->dev->of_node), +MOXTET_NIRQS ,0 , + &moxtet_irq_domain, moxtet);if (moxtet->irq.domain ==NULL ) {dev_err (moxtet->dev,"Could not add IRQ domain\n" );return -ENOMEM ;
[tip: irq/cleanups] bus: moxtet: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 14eb9e3d0bb93f66ad6c3a1ff9ec1c1d9935d194 Gitweb: https://git.kernel.org/tip/14eb9e3d0bb93f66ad6c3a1ff9ec1c1d9935d194 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:08 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
bus: moxtet: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/bus/moxtet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bus/moxtet.c +3 -3
@@ -737,9 +737,9 @@ static int moxtet_irq_setup(struct moxtet *moxtet) {int i, ret; - moxtet->irq.domain =irq_domain_add_simple (moxtet->dev->of_node, -MOXTET_NIRQS ,0 , - &moxtet_irq_domain, moxtet); + moxtet->irq.domain =irq_domain_create_simple (of_fwnode_handle (moxtet->dev->of_node), +MOXTET_NIRQS ,0 , + &moxtet_irq_domain, moxtet);if (moxtet->irq.domain ==NULL ) {dev_err (moxtet->dev,"Could not add IRQ domain\n" );return -ENOMEM ;
[tip: irq/cleanups] bus: moxtet: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 13c984392b28651e9665cc0b05375fa37895bacb Gitweb: https://git.kernel.org/tip/13c984392b28651e9665cc0b05375fa37895bacb Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:08 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:08 +02:00
bus: moxtet: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/bus/moxtet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/bus/moxtet.c +3 -3
@@ -737,9 +737,9 @@ static int moxtet_irq_setup(struct moxtet *moxtet) {int i, ret; - moxtet->irq.domain =irq_domain_add_simple (moxtet->dev->of_node, -MOXTET_NIRQS ,0 , - &moxtet_irq_domain, moxtet); + moxtet->irq.domain =irq_domain_create_simple (of_fwnode_handle (moxtet->dev->of_node), +MOXTET_NIRQS ,0 , + &moxtet_irq_domain, moxtet);if (moxtet->irq.domain ==NULL ) {dev_err (moxtet->dev,"Could not add IRQ domain\n" );return -ENOMEM ;
PATCH v2 16/57 irqdomain: edac: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
--- drivers/edac/altera_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/altera_edac.c +2 -2
@@ -2130,8 +2130,8 @@ static int altr_edac_a10_probe(struct platform_device *pdev) edac->irq_chip.name = pdev->dev.of_node->name; edac->irq_chip.irq_mask = a10_eccmgr_irq_mask; edac->irq_chip.irq_unmask = a10_eccmgr_irq_unmask; - edac->domain =irq_domain_add_linear (pdev->dev.of_node,64 , - &a10_eccmgr_ic_ops, edac); + edac->domain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), +64 , &a10_eccmgr_ic_ops, edac);if (!edac->domain) {dev_err (&pdev->dev,"Error adding IRQ domain\n" );return -ENOMEM ;
Signature · 1 line
2.49.0
[tip: irq/cleanups] EDAC/altera: Switch to irq_domain_create_linear()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: aeba799a19594e9fafaf7106f915e112d3f6e58b Gitweb: https://git.kernel.org/tip/aeba799a19594e9fafaf7106f915e112d3f6e58b Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:09 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:04 +02:00
EDAC/altera: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/edac/altera_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/altera_edac.c +2 -2
@@ -2130,8 +2130,8 @@ static int altr_edac_a10_probe(struct platform_device *pdev) edac->irq_chip.name = pdev->dev.of_node->name; edac->irq_chip.irq_mask = a10_eccmgr_irq_mask; edac->irq_chip.irq_unmask = a10_eccmgr_irq_unmask; - edac->domain =irq_domain_add_linear (pdev->dev.of_node,64 , - &a10_eccmgr_ic_ops, edac); + edac->domain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), +64 , &a10_eccmgr_ic_ops, edac);if (!edac->domain) {dev_err (&pdev->dev,"Error adding IRQ domain\n" );return -ENOMEM ;
[tip: irq/cleanups] EDAC/altera: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 137c278c39e845185670b3c09b94457d0c0bf468 Gitweb: https://git.kernel.org/tip/137c278c39e845185670b3c09b94457d0c0bf468 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:09 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
EDAC/altera: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/edac/altera_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/altera_edac.c +2 -2
@@ -2130,8 +2130,8 @@ static int altr_edac_a10_probe(struct platform_device *pdev) edac->irq_chip.name = pdev->dev.of_node->name; edac->irq_chip.irq_mask = a10_eccmgr_irq_mask; edac->irq_chip.irq_unmask = a10_eccmgr_irq_unmask; - edac->domain =irq_domain_add_linear (pdev->dev.of_node,64 , - &a10_eccmgr_ic_ops, edac); + edac->domain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), +64 , &a10_eccmgr_ic_ops, edac);if (!edac->domain) {dev_err (&pdev->dev,"Error adding IRQ domain\n" );return -ENOMEM ;
[tip: irq/cleanups] EDAC/altera: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 6be00e43351e61ff9985d7a6fbd0c61414a26b57 Gitweb: https://git.kernel.org/tip/6be00e43351e61ff9985d7a6fbd0c61414a26b57 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:09 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:09 +02:00
EDAC/altera: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/edac/altera_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/altera_edac.c +2 -2
@@ -2130,8 +2130,8 @@ static int altr_edac_a10_probe(struct platform_device *pdev) edac->irq_chip.name = pdev->dev.of_node->name; edac->irq_chip.irq_mask = a10_eccmgr_irq_mask; edac->irq_chip.irq_unmask = a10_eccmgr_irq_unmask; - edac->domain =irq_domain_add_linear (pdev->dev.of_node,64 , - &a10_eccmgr_ic_ops, edac); + edac->domain =irq_domain_create_linear (of_fwnode_handle (pdev->dev.of_node), +64 , &a10_eccmgr_ic_ops, edac);if (!edac->domain) {dev_err (&pdev->dev,"Error adding IRQ domain\n" );return -ENOMEM ;
PATCH v2 17/57 irqdomain: gpio: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
--- drivers/gpio/gpio-brcmstb.c | 2 +- drivers/gpio/gpio-davinci.c | 5 ++--- drivers/gpio/gpio-em.c | 5 +++-- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-lpc18xx.c | 8 +++----- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-mxs.c | 4 ++-- drivers/gpio/gpio-pxa.c | 6 +++--- 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 | 5 ++--- include/linux/gpio/driver.h | 5 +++-- 15 files changed, 26 insertions(+), 28 deletions(-)
drivers/gpio/gpio-brcmstb.c +1 -1
@@ -437,7 +437,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,int err; priv->irq_domain = -irq_domain_add_linear (np, priv->num_gpios, +irq_domain_create_linear (of_fwnode_handle (np), priv->num_gpios, &brcmstb_gpio_irq_domain_ops, priv);if (!priv->irq_domain) {
drivers/gpio/gpio-davinci.c +2 -3
@@ -479,9 +479,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)return irq; } - irq_domain =irq_domain_add_legacy (dev->of_node, ngpio, irq,0 , - &davinci_gpio_irq_ops, - chips); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (dev->of_node), ngpio, irq,0 , + &davinci_gpio_irq_ops, chips);if (!irq_domain) {dev_err (dev,"Couldn't register an IRQ domain\n" );return -ENODEV ;
drivers/gpio/gpio-em.c +3 -2
@@ -323,8 +323,9 @@ static int em_gio_probe(struct platform_device *pdev) irq_chip->irq_release_resources = em_gio_irq_relres; irq_chip->flags =IRQCHIP_SKIP_SET_WAKE |IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, ngpios,0 , - &em_gio_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + ngpios,0 , + &em_gio_irq_domain_ops, p);if (!p->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" );return -ENXIO ;
drivers/gpio/gpio-grgpio.c +1 -1
@@ -397,7 +397,7 @@ static int grgpio_probe(struct platform_device *ofdev)return -EINVAL ; } - priv->domain =irq_domain_add_linear (np, gc->ngpio, + priv->domain =irq_domain_create_linear (of_fwnode_handle (np), gc->ngpio, &grgpio_irq_domain_ops, priv);if (!priv->domain) {
drivers/gpio/gpio-lpc18xx.c +3 -5
@@ -240,11 +240,9 @@ static int lpc18xx_gpio_pin_ic_probe(struct lpc18xx_gpio_chip *gc)raw_spin_lock_init (&ic->lock); - ic->domain =irq_domain_add_hierarchy (parent_domain,0 , -NR_LPC18XX_GPIO_PIN_IC_IRQS , - dev->of_node, - &lpc18xx_gpio_pin_ic_domain_ops, - ic); + ic->domain =irq_domain_create_hierarchy (parent_domain,0 ,NR_LPC18XX_GPIO_PIN_IC_IRQS , +of_fwnode_handle (dev->of_node), + &lpc18xx_gpio_pin_ic_domain_ops, ic);if (!ic->domain) {pr_err ("unable to add irq domain\n" ); ret = -ENODEV ;
drivers/gpio/gpio-mvebu.c +1 -1
@@ -1242,7 +1242,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)return 0 ; mvchip->domain = -irq_domain_add_linear (np, ngpios, &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (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);
drivers/gpio/gpio-mxc.c +1 -1
@@ -502,7 +502,7 @@ static int mxc_gpio_probe(struct platform_device *pdev) goto out_bgio; } - port->domain =irq_domain_add_legacy (np,32 , irq_base,0 , + port->domain =irq_domain_create_legacy (of_fwnode_handle (np),32 , irq_base,0 , &irq_domain_simple_ops,NULL );if (!port->domain) { err = -ENODEV ;
drivers/gpio/gpio-mxs.c +2 -2
@@ -303,8 +303,8 @@ static int mxs_gpio_probe(struct platform_device *pdev) goto out_iounmap; } - port->domain =irq_domain_add_legacy (np,32 , irq_base,0 , - &irq_domain_simple_ops,NULL ); + port->domain =irq_domain_create_legacy (of_fwnode_handle (np),32 , irq_base,0 , + &irq_domain_simple_ops,NULL );if (!port->domain) { err = -ENODEV ; goto out_iounmap;
drivers/gpio/gpio-pxa.c +3 -3
@@ -636,9 +636,9 @@ static int pxa_gpio_probe(struct platform_device *pdev)if (!pxa_last_gpio)return -EINVAL ; - pchip->irqdomain =irq_domain_add_legacy (pdev->dev.of_node, - pxa_last_gpio +1 , irq_base, -0 , &pxa_irq_domain_ops, pchip); + pchip->irqdomain =irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node), + pxa_last_gpio +1 , irq_base,0 , + &pxa_irq_domain_ops, pchip);if (!pchip->irqdomain)return -ENOMEM ;
drivers/gpio/gpio-rockchip.c +1 -1
@@ -521,7 +521,7 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)struct irq_chip_generic *gc;int ret; - bank->domain =irq_domain_add_linear (bank->of_node,32 , + bank->domain =irq_domain_create_linear (of_fwnode_handle (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",
drivers/gpio/gpio-sa1100.c +1 -1
@@ -319,7 +319,7 @@ void __init sa1100_init_gpio(void)gpiochip_add_data (&sa1100_gpio_chip.chip,NULL ); - sa1100_gpio_irqdomain =irq_domain_add_simple (NULL , + sa1100_gpio_irqdomain =irq_domain_create_simple (NULL ,28 ,IRQ_GPIO0 , &sa1100_gpio_irqdomain_ops, sgc);
drivers/gpio/gpio-sodaville.c +1 -1
@@ -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); - sd->id =irq_domain_add_legacy (pdev->dev.of_node,SDV_NUM_PUB_GPIOS , + sd->id =irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node),SDV_NUM_PUB_GPIOS , sd->irq_base,0 , &irq_domain_sdv_ops, sd);if (!sd->id)return -ENODEV ;
drivers/gpio/gpio-tb10x.c +1 -1
@@ -183,7 +183,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)if (ret !=0 )return ret; - tb10x_gpio->domain =irq_domain_add_linear (np, + tb10x_gpio->domain =irq_domain_create_linear (of_fwnode_handle (np), tb10x_gpio->gc.ngpio, &irq_generic_chip_ops,NULL );if (!tb10x_gpio->domain) {
drivers/gpio/gpio-twl4030.c +2 -3
@@ -502,7 +502,6 @@ static void gpio_twl4030_power_off_action(void *data)static int gpio_twl4030_probe (struct platform_device *pdev) {struct twl4030_gpio_platform_data *pdata; -struct device_node *node = pdev->dev.of_node;struct gpio_twl4030_priv *priv;int ret, irq_base;
@@ -524,8 +523,8 @@ static int gpio_twl4030_probe(struct platform_device *pdev)return irq_base; } -irq_domain_add_legacy (node,TWL4030_GPIO_MAX , irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node),TWL4030_GPIO_MAX , irq_base,0 , + &irq_domain_simple_ops,NULL ); ret =twl4030_sih_setup (&pdev->dev,TWL4030_MODULE_GPIO , irq_base);if (ret <0 )
include/linux/gpio/driver.h +3 -2
@@ -287,8 +287,9 @@ struct gpio_irq_chip {/** * @first: * -* Required for static IRQ allocation. If set, irq_domain_add_simple() -* will allocate and map all IRQs during initialization. +* Required for static IRQ allocation. If set, +* irq_domain_create_simple() will allocate and map all IRQs +* during initialization. */ unsigned int first;
Signature · 1 line
2.49.0
Andy Shevchenko
maintainerRe: [PATCH v2 17/57] irqdomain: gpio: Switch to irq_domain_create_*()
Quoted 10 lines · Jiri Slaby (SUSE)
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct
fwnode_handleinstead of structdevice_node. Therefore,of_fwnode_handle()is added around the original parameter.Note some of the users can likely use
dev->fwnodedirectly instead of indirectof_fwnode_handle(dev->of_node). Butdev->fwnodeis not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
...
include/linux/gpio/driver.h struct gpio_irq_chip {
Quoted 6 lines
include/linux/gpio/driver.h +0
-2/** * @first: * -* Required for static IRQ allocation. If set, irq_domain_add_simple() -* will allocate and map all IRQs during initialization.
Can we leave this untouched? The new name will make the string 81 characters long and I don't think we care about that, on the pros side it will reduce a churn in this patch.
Quoted 4 lines
include/linux/gpio/driver.h +3
-0+* Required for static IRQ allocation. If set, +* irq_domain_create_simple() will allocate and map all IRQs +* during initialization. */
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 17/57] irqdomain: gpio: Switch to irq_domain_create_*()
Quoted 19 lines · Andy Shevchenko
Quoted 10 lines · Jiri Slaby (SUSE)
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct
fwnode_handleinstead of structdevice_node. Therefore,of_fwnode_handle()is added around the original parameter.Note some of the users can likely use
dev->fwnodedirectly instead of indirectof_fwnode_handle(dev->of_node). Butdev->fwnodeis not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW)....
Quoted 4 lines
/**
* @first:
*include/linux/gpio/driver.h +0
-1-* Required for static IRQ allocation. If set, irq_domain_add_simple()
Quoted 5 lines
include/linux/gpio/driver.h struct gpio_irq_chip { · line 291
Quoted 1 line
include/linux/gpio/driver.h +0
-1-* will allocate and map all IRQs during initialization. Can we leave this untouched? The new name will make the string 81 characters long and I don't think we care about that, on the pros side it will reduce a churn in this patch.
Sure -- fixed.
thanks,
Signature · 2 lines
js suse labs
[tip: irq/cleanups] gpio: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 322a13f2f1211a138de9fb9cf570f7edf5f093ac Gitweb: https://git.kernel.org/tip/322a13f2f1211a138de9fb9cf570f7edf5f093ac Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:10 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:05 +02:00
gpio: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/gpio/gpio-brcmstb.c | 2 +- drivers/gpio/gpio-davinci.c | 5 ++--- drivers/gpio/gpio-em.c | 5 +++-- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-lpc18xx.c | 8 +++----- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-mxs.c | 4 ++-- drivers/gpio/gpio-pxa.c | 6 +++--- 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 | 5 ++--- include/linux/gpio/driver.h | 5 +++-- 15 files changed, 26 insertions(+), 28 deletions(-)
drivers/gpio/gpio-brcmstb.c +1 -1
@@ -437,7 +437,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,int err; priv->irq_domain = -irq_domain_add_linear (np, priv->num_gpios, +irq_domain_create_linear (of_fwnode_handle (np), priv->num_gpios, &brcmstb_gpio_irq_domain_ops, priv);if (!priv->irq_domain) {
drivers/gpio/gpio-davinci.c +2 -3
@@ -479,9 +479,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)return irq; } - irq_domain =irq_domain_add_legacy (dev->of_node, ngpio, irq,0 , - &davinci_gpio_irq_ops, - chips); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (dev->of_node), ngpio, irq,0 , + &davinci_gpio_irq_ops, chips);if (!irq_domain) {dev_err (dev,"Couldn't register an IRQ domain\n" );return -ENODEV ;
drivers/gpio/gpio-em.c +3 -2
@@ -323,8 +323,9 @@ static int em_gio_probe(struct platform_device *pdev) irq_chip->irq_release_resources = em_gio_irq_relres; irq_chip->flags =IRQCHIP_SKIP_SET_WAKE |IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, ngpios,0 , - &em_gio_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + ngpios,0 , + &em_gio_irq_domain_ops, p);if (!p->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" );return -ENXIO ;
drivers/gpio/gpio-grgpio.c +1 -1
@@ -397,7 +397,7 @@ static int grgpio_probe(struct platform_device *ofdev)return -EINVAL ; } - priv->domain =irq_domain_add_linear (np, gc->ngpio, + priv->domain =irq_domain_create_linear (of_fwnode_handle (np), gc->ngpio, &grgpio_irq_domain_ops, priv);if (!priv->domain) {
drivers/gpio/gpio-lpc18xx.c +3 -5
@@ -240,11 +240,9 @@ static int lpc18xx_gpio_pin_ic_probe(struct lpc18xx_gpio_chip *gc)raw_spin_lock_init (&ic->lock); - ic->domain =irq_domain_add_hierarchy (parent_domain,0 , -NR_LPC18XX_GPIO_PIN_IC_IRQS , - dev->of_node, - &lpc18xx_gpio_pin_ic_domain_ops, - ic); + ic->domain =irq_domain_create_hierarchy (parent_domain,0 ,NR_LPC18XX_GPIO_PIN_IC_IRQS , +of_fwnode_handle (dev->of_node), + &lpc18xx_gpio_pin_ic_domain_ops, ic);if (!ic->domain) {pr_err ("unable to add irq domain\n" ); ret = -ENODEV ;
drivers/gpio/gpio-mvebu.c +1 -1
@@ -1242,7 +1242,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)return 0 ; mvchip->domain = -irq_domain_add_linear (np, ngpios, &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (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);
drivers/gpio/gpio-mxc.c +1 -1
@@ -502,7 +502,7 @@ static int mxc_gpio_probe(struct platform_device *pdev) goto out_bgio; } - port->domain =irq_domain_add_legacy (np,32 , irq_base,0 , + port->domain =irq_domain_create_legacy (of_fwnode_handle (np),32 , irq_base,0 , &irq_domain_simple_ops,NULL );if (!port->domain) { err = -ENODEV ;
drivers/gpio/gpio-mxs.c +2 -2
@@ -303,8 +303,8 @@ static int mxs_gpio_probe(struct platform_device *pdev) goto out_iounmap; } - port->domain =irq_domain_add_legacy (np,32 , irq_base,0 , - &irq_domain_simple_ops,NULL ); + port->domain =irq_domain_create_legacy (of_fwnode_handle (np),32 , irq_base,0 , + &irq_domain_simple_ops,NULL );if (!port->domain) { err = -ENODEV ; goto out_iounmap;
drivers/gpio/gpio-pxa.c +3 -3
@@ -636,9 +636,9 @@ static int pxa_gpio_probe(struct platform_device *pdev)if (!pxa_last_gpio)return -EINVAL ; - pchip->irqdomain =irq_domain_add_legacy (pdev->dev.of_node, - pxa_last_gpio +1 , irq_base, -0 , &pxa_irq_domain_ops, pchip); + pchip->irqdomain =irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node), + pxa_last_gpio +1 , irq_base,0 , + &pxa_irq_domain_ops, pchip);if (!pchip->irqdomain)return -ENOMEM ;
drivers/gpio/gpio-rockchip.c +1 -1
@@ -521,7 +521,7 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)struct irq_chip_generic *gc;int ret; - bank->domain =irq_domain_add_linear (bank->of_node,32 , + bank->domain =irq_domain_create_linear (of_fwnode_handle (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",
drivers/gpio/gpio-sa1100.c +1 -1
@@ -319,7 +319,7 @@ void __init sa1100_init_gpio(void)gpiochip_add_data (&sa1100_gpio_chip.chip,NULL ); - sa1100_gpio_irqdomain =irq_domain_add_simple (NULL , + sa1100_gpio_irqdomain =irq_domain_create_simple (NULL ,28 ,IRQ_GPIO0 , &sa1100_gpio_irqdomain_ops, sgc);
drivers/gpio/gpio-sodaville.c +1 -1
@@ -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); - sd->id =irq_domain_add_legacy (pdev->dev.of_node,SDV_NUM_PUB_GPIOS , + sd->id =irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node),SDV_NUM_PUB_GPIOS , sd->irq_base,0 , &irq_domain_sdv_ops, sd);if (!sd->id)return -ENODEV ;
drivers/gpio/gpio-tb10x.c +1 -1
@@ -183,7 +183,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)if (ret !=0 )return ret; - tb10x_gpio->domain =irq_domain_add_linear (np, + tb10x_gpio->domain =irq_domain_create_linear (of_fwnode_handle (np), tb10x_gpio->gc.ngpio, &irq_generic_chip_ops,NULL );if (!tb10x_gpio->domain) {
drivers/gpio/gpio-twl4030.c +2 -3
@@ -502,7 +502,6 @@ static void gpio_twl4030_power_off_action(void *data)static int gpio_twl4030_probe (struct platform_device *pdev) {struct twl4030_gpio_platform_data *pdata; -struct device_node *node = pdev->dev.of_node;struct gpio_twl4030_priv *priv;int ret, irq_base;
@@ -524,8 +523,8 @@ static int gpio_twl4030_probe(struct platform_device *pdev)return irq_base; } -irq_domain_add_legacy (node,TWL4030_GPIO_MAX , irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node),TWL4030_GPIO_MAX , irq_base,0 , + &irq_domain_simple_ops,NULL ); ret =twl4030_sih_setup (&pdev->dev,TWL4030_MODULE_GPIO , irq_base);if (ret <0 )
include/linux/gpio/driver.h +3 -2
@@ -287,8 +287,9 @@ struct gpio_irq_chip {/** * @first: * -* Required for static IRQ allocation. If set, irq_domain_add_simple() -* will allocate and map all IRQs during initialization. +* Required for static IRQ allocation. If set, +* irq_domain_create_simple() will allocate and map all IRQs +* during initialization. */ unsigned int first;
[tip: irq/cleanups] gpio: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 02226c57602d9a0d0ea37c4c58a6d5975e525961 Gitweb: https://git.kernel.org/tip/02226c57602d9a0d0ea37c4c58a6d5975e525961 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:10 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
gpio: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/gpio/gpio-brcmstb.c | 2 +- drivers/gpio/gpio-davinci.c | 5 ++--- drivers/gpio/gpio-em.c | 5 +++-- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-lpc18xx.c | 8 +++----- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-mxs.c | 4 ++-- drivers/gpio/gpio-pxa.c | 6 +++--- 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 | 5 ++--- include/linux/gpio/driver.h | 5 +++-- 15 files changed, 26 insertions(+), 28 deletions(-)
drivers/gpio/gpio-brcmstb.c +1 -1
@@ -437,7 +437,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,int err; priv->irq_domain = -irq_domain_add_linear (np, priv->num_gpios, +irq_domain_create_linear (of_fwnode_handle (np), priv->num_gpios, &brcmstb_gpio_irq_domain_ops, priv);if (!priv->irq_domain) {
drivers/gpio/gpio-davinci.c +2 -3
@@ -479,9 +479,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)return irq; } - irq_domain =irq_domain_add_legacy (dev->of_node, ngpio, irq,0 , - &davinci_gpio_irq_ops, - chips); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (dev->of_node), ngpio, irq,0 , + &davinci_gpio_irq_ops, chips);if (!irq_domain) {dev_err (dev,"Couldn't register an IRQ domain\n" );return -ENODEV ;
drivers/gpio/gpio-em.c +3 -2
@@ -323,8 +323,9 @@ static int em_gio_probe(struct platform_device *pdev) irq_chip->irq_release_resources = em_gio_irq_relres; irq_chip->flags =IRQCHIP_SKIP_SET_WAKE |IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, ngpios,0 , - &em_gio_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + ngpios,0 , + &em_gio_irq_domain_ops, p);if (!p->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" );return -ENXIO ;
drivers/gpio/gpio-grgpio.c +1 -1
@@ -397,7 +397,7 @@ static int grgpio_probe(struct platform_device *ofdev)return -EINVAL ; } - priv->domain =irq_domain_add_linear (np, gc->ngpio, + priv->domain =irq_domain_create_linear (of_fwnode_handle (np), gc->ngpio, &grgpio_irq_domain_ops, priv);if (!priv->domain) {
drivers/gpio/gpio-lpc18xx.c +3 -5
@@ -240,11 +240,9 @@ static int lpc18xx_gpio_pin_ic_probe(struct lpc18xx_gpio_chip *gc)raw_spin_lock_init (&ic->lock); - ic->domain =irq_domain_add_hierarchy (parent_domain,0 , -NR_LPC18XX_GPIO_PIN_IC_IRQS , - dev->of_node, - &lpc18xx_gpio_pin_ic_domain_ops, - ic); + ic->domain =irq_domain_create_hierarchy (parent_domain,0 ,NR_LPC18XX_GPIO_PIN_IC_IRQS , +of_fwnode_handle (dev->of_node), + &lpc18xx_gpio_pin_ic_domain_ops, ic);if (!ic->domain) {pr_err ("unable to add irq domain\n" ); ret = -ENODEV ;
drivers/gpio/gpio-mvebu.c +1 -1
@@ -1242,7 +1242,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)return 0 ; mvchip->domain = -irq_domain_add_linear (np, ngpios, &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (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);
drivers/gpio/gpio-mxc.c +1 -1
@@ -502,7 +502,7 @@ static int mxc_gpio_probe(struct platform_device *pdev) goto out_bgio; } - port->domain =irq_domain_add_legacy (np,32 , irq_base,0 , + port->domain =irq_domain_create_legacy (of_fwnode_handle (np),32 , irq_base,0 , &irq_domain_simple_ops,NULL );if (!port->domain) { err = -ENODEV ;
drivers/gpio/gpio-mxs.c +2 -2
@@ -303,8 +303,8 @@ static int mxs_gpio_probe(struct platform_device *pdev) goto out_iounmap; } - port->domain =irq_domain_add_legacy (np,32 , irq_base,0 , - &irq_domain_simple_ops,NULL ); + port->domain =irq_domain_create_legacy (of_fwnode_handle (np),32 , irq_base,0 , + &irq_domain_simple_ops,NULL );if (!port->domain) { err = -ENODEV ; goto out_iounmap;
drivers/gpio/gpio-pxa.c +3 -3
@@ -636,9 +636,9 @@ static int pxa_gpio_probe(struct platform_device *pdev)if (!pxa_last_gpio)return -EINVAL ; - pchip->irqdomain =irq_domain_add_legacy (pdev->dev.of_node, - pxa_last_gpio +1 , irq_base, -0 , &pxa_irq_domain_ops, pchip); + pchip->irqdomain =irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node), + pxa_last_gpio +1 , irq_base,0 , + &pxa_irq_domain_ops, pchip);if (!pchip->irqdomain)return -ENOMEM ;
drivers/gpio/gpio-rockchip.c +1 -1
@@ -521,7 +521,7 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)struct irq_chip_generic *gc;int ret; - bank->domain =irq_domain_add_linear (bank->of_node,32 , + bank->domain =irq_domain_create_linear (of_fwnode_handle (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",
drivers/gpio/gpio-sa1100.c +1 -1
@@ -319,7 +319,7 @@ void __init sa1100_init_gpio(void)gpiochip_add_data (&sa1100_gpio_chip.chip,NULL ); - sa1100_gpio_irqdomain =irq_domain_add_simple (NULL , + sa1100_gpio_irqdomain =irq_domain_create_simple (NULL ,28 ,IRQ_GPIO0 , &sa1100_gpio_irqdomain_ops, sgc);
drivers/gpio/gpio-sodaville.c +1 -1
@@ -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); - sd->id =irq_domain_add_legacy (pdev->dev.of_node,SDV_NUM_PUB_GPIOS , + sd->id =irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node),SDV_NUM_PUB_GPIOS , sd->irq_base,0 , &irq_domain_sdv_ops, sd);if (!sd->id)return -ENODEV ;
drivers/gpio/gpio-tb10x.c +1 -1
@@ -183,7 +183,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)if (ret !=0 )return ret; - tb10x_gpio->domain =irq_domain_add_linear (np, + tb10x_gpio->domain =irq_domain_create_linear (of_fwnode_handle (np), tb10x_gpio->gc.ngpio, &irq_generic_chip_ops,NULL );if (!tb10x_gpio->domain) {
drivers/gpio/gpio-twl4030.c +2 -3
@@ -502,7 +502,6 @@ static void gpio_twl4030_power_off_action(void *data)static int gpio_twl4030_probe (struct platform_device *pdev) {struct twl4030_gpio_platform_data *pdata; -struct device_node *node = pdev->dev.of_node;struct gpio_twl4030_priv *priv;int ret, irq_base;
@@ -524,8 +523,8 @@ static int gpio_twl4030_probe(struct platform_device *pdev)return irq_base; } -irq_domain_add_legacy (node,TWL4030_GPIO_MAX , irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node),TWL4030_GPIO_MAX , irq_base,0 , + &irq_domain_simple_ops,NULL ); ret =twl4030_sih_setup (&pdev->dev,TWL4030_MODULE_GPIO , irq_base);if (ret <0 )
include/linux/gpio/driver.h +3 -2
@@ -287,8 +287,9 @@ struct gpio_irq_chip {/** * @first: * -* Required for static IRQ allocation. If set, irq_domain_add_simple() -* will allocate and map all IRQs during initialization. +* Required for static IRQ allocation. If set, +* irq_domain_create_simple() will allocate and map all IRQs +* during initialization. */ unsigned int first;
[tip: irq/cleanups] gpio: Switch to irq_domain_create_*()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 9cf19f061ccc98b63367b16551c290016b7d6b13 Gitweb: https://git.kernel.org/tip/9cf19f061ccc98b63367b16551c290016b7d6b13 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:10 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:09 +02:00
gpio: Switch to irq_domain_create_*()
irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/gpio/gpio-brcmstb.c | 2 +- drivers/gpio/gpio-davinci.c | 5 ++--- drivers/gpio/gpio-em.c | 5 +++-- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-lpc18xx.c | 8 +++----- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-mxs.c | 4 ++-- drivers/gpio/gpio-pxa.c | 6 +++--- 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 | 5 ++--- include/linux/gpio/driver.h | 5 +++-- 15 files changed, 26 insertions(+), 28 deletions(-)
drivers/gpio/gpio-brcmstb.c +1 -1
@@ -437,7 +437,7 @@ static int brcmstb_gpio_irq_setup(struct platform_device *pdev,int err; priv->irq_domain = -irq_domain_add_linear (np, priv->num_gpios, +irq_domain_create_linear (of_fwnode_handle (np), priv->num_gpios, &brcmstb_gpio_irq_domain_ops, priv);if (!priv->irq_domain) {
drivers/gpio/gpio-davinci.c +2 -3
@@ -479,9 +479,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)return irq; } - irq_domain =irq_domain_add_legacy (dev->of_node, ngpio, irq,0 , - &davinci_gpio_irq_ops, - chips); + irq_domain =irq_domain_create_legacy (of_fwnode_handle (dev->of_node), ngpio, irq,0 , + &davinci_gpio_irq_ops, chips);if (!irq_domain) {dev_err (dev,"Couldn't register an IRQ domain\n" );return -ENODEV ;
drivers/gpio/gpio-em.c +3 -2
@@ -323,8 +323,9 @@ static int em_gio_probe(struct platform_device *pdev) irq_chip->irq_release_resources = em_gio_irq_relres; irq_chip->flags =IRQCHIP_SKIP_SET_WAKE |IRQCHIP_MASK_ON_SUSPEND ; - p->irq_domain =irq_domain_add_simple (dev->of_node, ngpios,0 , - &em_gio_irq_domain_ops, p); + p->irq_domain =irq_domain_create_simple (of_fwnode_handle (dev->of_node), + ngpios,0 , + &em_gio_irq_domain_ops, p);if (!p->irq_domain) {dev_err (dev,"cannot initialize irq domain\n" );return -ENXIO ;
drivers/gpio/gpio-grgpio.c +1 -1
@@ -397,7 +397,7 @@ static int grgpio_probe(struct platform_device *ofdev)return -EINVAL ; } - priv->domain =irq_domain_add_linear (np, gc->ngpio, + priv->domain =irq_domain_create_linear (of_fwnode_handle (np), gc->ngpio, &grgpio_irq_domain_ops, priv);if (!priv->domain) {
drivers/gpio/gpio-lpc18xx.c +3 -5
@@ -240,11 +240,9 @@ static int lpc18xx_gpio_pin_ic_probe(struct lpc18xx_gpio_chip *gc)raw_spin_lock_init (&ic->lock); - ic->domain =irq_domain_add_hierarchy (parent_domain,0 , -NR_LPC18XX_GPIO_PIN_IC_IRQS , - dev->of_node, - &lpc18xx_gpio_pin_ic_domain_ops, - ic); + ic->domain =irq_domain_create_hierarchy (parent_domain,0 ,NR_LPC18XX_GPIO_PIN_IC_IRQS , +of_fwnode_handle (dev->of_node), + &lpc18xx_gpio_pin_ic_domain_ops, ic);if (!ic->domain) {pr_err ("unable to add irq domain\n" ); ret = -ENODEV ;
drivers/gpio/gpio-mvebu.c +1 -1
@@ -1242,7 +1242,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)return 0 ; mvchip->domain = -irq_domain_add_linear (np, ngpios, &irq_generic_chip_ops,NULL ); +irq_domain_create_linear (of_fwnode_handle (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);
drivers/gpio/gpio-mxc.c +1 -1
@@ -502,7 +502,7 @@ static int mxc_gpio_probe(struct platform_device *pdev) goto out_bgio; } - port->domain =irq_domain_add_legacy (np,32 , irq_base,0 , + port->domain =irq_domain_create_legacy (of_fwnode_handle (np),32 , irq_base,0 , &irq_domain_simple_ops,NULL );if (!port->domain) { err = -ENODEV ;
drivers/gpio/gpio-mxs.c +2 -2
@@ -303,8 +303,8 @@ static int mxs_gpio_probe(struct platform_device *pdev) goto out_iounmap; } - port->domain =irq_domain_add_legacy (np,32 , irq_base,0 , - &irq_domain_simple_ops,NULL ); + port->domain =irq_domain_create_legacy (of_fwnode_handle (np),32 , irq_base,0 , + &irq_domain_simple_ops,NULL );if (!port->domain) { err = -ENODEV ; goto out_iounmap;
drivers/gpio/gpio-pxa.c +3 -3
@@ -636,9 +636,9 @@ static int pxa_gpio_probe(struct platform_device *pdev)if (!pxa_last_gpio)return -EINVAL ; - pchip->irqdomain =irq_domain_add_legacy (pdev->dev.of_node, - pxa_last_gpio +1 , irq_base, -0 , &pxa_irq_domain_ops, pchip); + pchip->irqdomain =irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node), + pxa_last_gpio +1 , irq_base,0 , + &pxa_irq_domain_ops, pchip);if (!pchip->irqdomain)return -ENOMEM ;
drivers/gpio/gpio-rockchip.c +1 -1
@@ -521,7 +521,7 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)struct irq_chip_generic *gc;int ret; - bank->domain =irq_domain_add_linear (bank->of_node,32 , + bank->domain =irq_domain_create_linear (of_fwnode_handle (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",
drivers/gpio/gpio-sa1100.c +1 -1
@@ -319,7 +319,7 @@ void __init sa1100_init_gpio(void)gpiochip_add_data (&sa1100_gpio_chip.chip,NULL ); - sa1100_gpio_irqdomain =irq_domain_add_simple (NULL , + sa1100_gpio_irqdomain =irq_domain_create_simple (NULL ,28 ,IRQ_GPIO0 , &sa1100_gpio_irqdomain_ops, sgc);
drivers/gpio/gpio-sodaville.c +1 -1
@@ -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); - sd->id =irq_domain_add_legacy (pdev->dev.of_node,SDV_NUM_PUB_GPIOS , + sd->id =irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node),SDV_NUM_PUB_GPIOS , sd->irq_base,0 , &irq_domain_sdv_ops, sd);if (!sd->id)return -ENODEV ;
drivers/gpio/gpio-tb10x.c +1 -1
@@ -183,7 +183,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)if (ret !=0 )return ret; - tb10x_gpio->domain =irq_domain_add_linear (np, + tb10x_gpio->domain =irq_domain_create_linear (of_fwnode_handle (np), tb10x_gpio->gc.ngpio, &irq_generic_chip_ops,NULL );if (!tb10x_gpio->domain) {
drivers/gpio/gpio-twl4030.c +2 -3
@@ -502,7 +502,6 @@ static void gpio_twl4030_power_off_action(void *data)static int gpio_twl4030_probe (struct platform_device *pdev) {struct twl4030_gpio_platform_data *pdata; -struct device_node *node = pdev->dev.of_node;struct gpio_twl4030_priv *priv;int ret, irq_base;
@@ -524,8 +523,8 @@ static int gpio_twl4030_probe(struct platform_device *pdev)return irq_base; } -irq_domain_add_legacy (node,TWL4030_GPIO_MAX , irq_base,0 , - &irq_domain_simple_ops,NULL ); +irq_domain_create_legacy (of_fwnode_handle (pdev->dev.of_node),TWL4030_GPIO_MAX , irq_base,0 , + &irq_domain_simple_ops,NULL ); ret =twl4030_sih_setup (&pdev->dev,TWL4030_MODULE_GPIO , irq_base);if (ret <0 )
include/linux/gpio/driver.h +3 -2
@@ -287,8 +287,9 @@ struct gpio_irq_chip {/** * @first: * -* Required for static IRQ allocation. If set, irq_domain_add_simple() -* will allocate and map all IRQs during initialization. +* Required for static IRQ allocation. If set, +* irq_domain_create_simple() will allocate and map all IRQs +* during initialization. */ unsigned int first;
PATCH v2 18/57 irqdomain: gpu: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
--- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/msm/msm_mdss.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2 -2
@@ -725,8 +725,8 @@ static const struct irq_domain_ops amdgpu_hw_irqdomain_ops = {*/ int amdgpu_irq_add_domain (struct amdgpu_device *adev) { - adev->irq.domain =irq_domain_add_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , - &amdgpu_hw_irqdomain_ops, adev); + adev->irq.domain =irq_domain_create_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , + &amdgpu_hw_irqdomain_ops, adev);if (!adev->irq.domain) {DRM_ERROR ("GPU irq add domain failed\n" );return -ENODEV ;
drivers/gpu/drm/msm/msm_mdss.c +1 -1
@@ -150,7 +150,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss) dev = msm_mdss->dev; - domain =irq_domain_add_linear (dev->of_node,32 , + domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node),32 , &msm_mdss_irqdomain_ops, msm_mdss);if (!domain) {dev_err (dev,"failed to add irq_domain\n" );
drivers/gpu/ipu-v3/ipu-common.c +2 -2
@@ -1169,8 +1169,8 @@ static int ipu_irq_init(struct ipu_soc *ipu) };int ret, i; - ipu->domain =irq_domain_add_linear (ipu->dev->of_node,IPU_NUM_IRQS , - &irq_generic_chip_ops, ipu); + ipu->domain =irq_domain_create_linear (of_fwnode_handle (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" );return -ENODEV ;
Signature · 1 line
2.49.0
Re: [PATCH v2 18/57] irqdomain: gpu: Switch to irq_domain_create_linear()
Quoted 25 lines · Jiri Slaby (SUSE)
irq_domain_add_linear()is going away as being obsolete now. Switch to the preferredirq_domain_create_linear(). That differs in the first
parameter: It takes more generic structfwnode_handleinstead of structdevice_node. Therefore,of_fwnode_handle()is added around the parameter.Note some of the users can likely use
dev->fwnodedirectly instead of indirectof_fwnode_handle(dev->of_node). Butdev->fwnodeis not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Simona Vetter <[email protected]>Cc Rob Clark <[email protected]>Cc Abhinav Kumar <[email protected]>Cc Dmitry Baryshkov <[email protected]>Cc Sean Paul <[email protected]>Cc Marijn Suijten <[email protected]>Cc Philipp Zabel <[email protected]>
Quoted 4 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/msm/msm_mdss.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 4 ++--
I would suggest splitting this by driver.
Alex
Quoted 48 lines
3 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2
-2@@ -725,8 +725,8 @@ static const struct irq_domain_ops amdgpu_hw_irqdomain_ops = {*/ int amdgpu_irq_add_domain (struct amdgpu_device *adev) { - adev->irq.domain =irq_domain_add_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , - &amdgpu_hw_irqdomain_ops, adev); + adev->irq.domain =irq_domain_create_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , + &amdgpu_hw_irqdomain_ops, adev);if (!adev->irq.domain) {DRM_ERROR ("GPU irq add domain failed\n" );return -ENODEV ;drivers/gpu/drm/msm/msm_mdss.c +1
-1@@ -150,7 +150,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss) dev = msm_mdss->dev; - domain =irq_domain_add_linear (dev->of_node,32 , + domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node),32 , &msm_mdss_irqdomain_ops, msm_mdss);if (!domain) {dev_err (dev,"failed to add irq_domain\n" );drivers/gpu/ipu-v3/ipu-common.c +2
-3@@ -1169,8 +1169,8 @@ static int ipu_irq_init(struct ipu_soc *ipu) };int ret, i; - ipu->domain =irq_domain_add_linear (ipu->dev->of_node,IPU_NUM_IRQS , - &irq_generic_chip_ops, ipu); + ipu->domain =irq_domain_create_linear (of_fwnode_handle (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" );return -ENODEV ; --2.49.0
Re: [PATCH v2 18/57] irqdomain: gpu: Switch to irq_domain_create_linear()
Quoted 31 lines · Alex Deucher
Quoted 25 lines · Jiri Slaby (SUSE)
irq_domain_add_linear()is going away as being obsolete now. Switch to the preferredirq_domain_create_linear(). That differs in the first
parameter: It takes more generic structfwnode_handleinstead of structdevice_node. Therefore,of_fwnode_handle()is added around the parameter.Note some of the users can likely use
dev->fwnodedirectly instead of indirectof_fwnode_handle(dev->of_node). Butdev->fwnodeis not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).Signed-off-by Jiri Slaby (SUSE) <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Simona Vetter <[email protected]>Cc Rob Clark <[email protected]>Cc Abhinav Kumar <[email protected]>Cc Dmitry Baryshkov <[email protected]>Cc Sean Paul <[email protected]>Cc Marijn Suijten <[email protected]>Cc Philipp Zabel <[email protected]>Quoted 4 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/msm/msm_mdss.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 4 ++--
Quoted 1 line
I would suggest splitting this by driver.
Done for v3.
thanks,
Signature · 2 lines
js suse labs
[tip: irq/cleanups] gpu: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 487d52c2d837243079114cfbb63b7a3e4553af24 Gitweb: https://git.kernel.org/tip/487d52c2d837243079114cfbb63b7a3e4553af24 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:11 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:05 +02:00
gpu: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/msm/msm_mdss.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2 -2
@@ -725,8 +725,8 @@ static const struct irq_domain_ops amdgpu_hw_irqdomain_ops = {*/ int amdgpu_irq_add_domain (struct amdgpu_device *adev) { - adev->irq.domain =irq_domain_add_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , - &amdgpu_hw_irqdomain_ops, adev); + adev->irq.domain =irq_domain_create_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , + &amdgpu_hw_irqdomain_ops, adev);if (!adev->irq.domain) {DRM_ERROR ("GPU irq add domain failed\n" );return -ENODEV ;
drivers/gpu/drm/msm/msm_mdss.c +1 -1
@@ -150,7 +150,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss) dev = msm_mdss->dev; - domain =irq_domain_add_linear (dev->of_node,32 , + domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node),32 , &msm_mdss_irqdomain_ops, msm_mdss);if (!domain) {dev_err (dev,"failed to add irq_domain\n" );
drivers/gpu/ipu-v3/ipu-common.c +2 -2
@@ -1169,8 +1169,8 @@ static int ipu_irq_init(struct ipu_soc *ipu) };int ret, i; - ipu->domain =irq_domain_add_linear (ipu->dev->of_node,IPU_NUM_IRQS , - &irq_generic_chip_ops, ipu); + ipu->domain =irq_domain_create_linear (of_fwnode_handle (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" );return -ENODEV ;
[tip: irq/cleanups] gpu: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: cd9910d1e871c40184b2187464661873bc8733aa Gitweb: https://git.kernel.org/tip/cd9910d1e871c40184b2187464661873bc8733aa Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:11 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
gpu: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/msm/msm_mdss.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2 -2
@@ -725,8 +725,8 @@ static const struct irq_domain_ops amdgpu_hw_irqdomain_ops = {*/ int amdgpu_irq_add_domain (struct amdgpu_device *adev) { - adev->irq.domain =irq_domain_add_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , - &amdgpu_hw_irqdomain_ops, adev); + adev->irq.domain =irq_domain_create_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , + &amdgpu_hw_irqdomain_ops, adev);if (!adev->irq.domain) {DRM_ERROR ("GPU irq add domain failed\n" );return -ENODEV ;
drivers/gpu/drm/msm/msm_mdss.c +1 -1
@@ -150,7 +150,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss) dev = msm_mdss->dev; - domain =irq_domain_add_linear (dev->of_node,32 , + domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node),32 , &msm_mdss_irqdomain_ops, msm_mdss);if (!domain) {dev_err (dev,"failed to add irq_domain\n" );
drivers/gpu/ipu-v3/ipu-common.c +2 -2
@@ -1169,8 +1169,8 @@ static int ipu_irq_init(struct ipu_soc *ipu) };int ret, i; - ipu->domain =irq_domain_add_linear (ipu->dev->of_node,IPU_NUM_IRQS , - &irq_generic_chip_ops, ipu); + ipu->domain =irq_domain_create_linear (of_fwnode_handle (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" );return -ENODEV ;
[tip: irq/cleanups] gpu: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 493e1092676257b81be4c013405f1271497a0ed1 Gitweb: https://git.kernel.org/tip/493e1092676257b81be4c013405f1271497a0ed1 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:11 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:09 +02:00
gpu: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++-- drivers/gpu/drm/msm/msm_mdss.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2 -2
@@ -725,8 +725,8 @@ static const struct irq_domain_ops amdgpu_hw_irqdomain_ops = {*/ int amdgpu_irq_add_domain (struct amdgpu_device *adev) { - adev->irq.domain =irq_domain_add_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , - &amdgpu_hw_irqdomain_ops, adev); + adev->irq.domain =irq_domain_create_linear (NULL ,AMDGPU_MAX_IRQ_SRC_ID , + &amdgpu_hw_irqdomain_ops, adev);if (!adev->irq.domain) {DRM_ERROR ("GPU irq add domain failed\n" );return -ENODEV ;
drivers/gpu/drm/msm/msm_mdss.c +1 -1
@@ -150,7 +150,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss) dev = msm_mdss->dev; - domain =irq_domain_add_linear (dev->of_node,32 , + domain =irq_domain_create_linear (of_fwnode_handle (dev->of_node),32 , &msm_mdss_irqdomain_ops, msm_mdss);if (!domain) {dev_err (dev,"failed to add irq_domain\n" );
drivers/gpu/ipu-v3/ipu-common.c +2 -2
@@ -1169,8 +1169,8 @@ static int ipu_irq_init(struct ipu_soc *ipu) };int ret, i; - ipu->domain =irq_domain_add_linear (ipu->dev->of_node,IPU_NUM_IRQS , - &irq_generic_chip_ops, ipu); + ipu->domain =irq_domain_create_linear (of_fwnode_handle (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" );return -ENODEV ;
PATCH v2 19/57 irqdomain: i2c: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
--- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-cht-wc.c +1 -1
@@ -467,7 +467,7 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev)return ret;/* Alloc and register client IRQ */ - adap->irq_domain =irq_domain_add_linear (NULL ,1 , &irq_domain_simple_ops,NULL ); + adap->irq_domain =irq_domain_create_linear (NULL ,1 , &irq_domain_simple_ops,NULL );if (!adap->irq_domain)return -ENOMEM ;
drivers/i2c/muxes/i2c-mux-pca954x.c +3 -3
@@ -442,9 +442,9 @@ static int pca954x_irq_setup(struct i2c_mux_core *muxc)raw_spin_lock_init (&data->lock); - data->irq =irq_domain_add_linear (client->dev.of_node, - data->chip->nchans, - &irq_domain_simple_ops, data); + data->irq =irq_domain_create_linear (of_fwnode_handle (client->dev.of_node), + data->chip->nchans, + &irq_domain_simple_ops, data);if (!data->irq)return -ENODEV ;
Signature · 1 line
2.49.0
Re: [PATCH v2 19/57] irqdomain: i2c: Switch to irq_domain_create_linear()
drivers/i2c/muxes/i2c-mux-pca954x.c static int pca954x_irq_setup(struct i2c_mux_core *muxc) · line 447
Quoted 4 lines
drivers/i2c/muxes/i2c-mux-pca954x.c +3
-0+ data->irq =irq_domain_create_linear (of_fwnode_handle (client->dev.of_node), + data->chip->nchans, + &irq_domain_simple_ops, data);
Waiting for v3 here because of the suggested switch to dev_fwnode().
[tip: irq/cleanups] i2c: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 5a6815bbfe0d78c1475bedd32b0aaec0bab7e208 Gitweb: https://git.kernel.org/tip/5a6815bbfe0d78c1475bedd32b0aaec0bab7e208 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:12 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:05 +02:00
i2c: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-cht-wc.c +1 -1
@@ -467,7 +467,7 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev)return ret;/* Alloc and register client IRQ */ - adap->irq_domain =irq_domain_add_linear (NULL ,1 , &irq_domain_simple_ops,NULL ); + adap->irq_domain =irq_domain_create_linear (NULL ,1 , &irq_domain_simple_ops,NULL );if (!adap->irq_domain)return -ENOMEM ;
drivers/i2c/muxes/i2c-mux-pca954x.c +3 -3
@@ -442,9 +442,9 @@ static int pca954x_irq_setup(struct i2c_mux_core *muxc)raw_spin_lock_init (&data->lock); - data->irq =irq_domain_add_linear (client->dev.of_node, - data->chip->nchans, - &irq_domain_simple_ops, data); + data->irq =irq_domain_create_linear (of_fwnode_handle (client->dev.of_node), + data->chip->nchans, + &irq_domain_simple_ops, data);if (!data->irq)return -ENODEV ;
[tip: irq/cleanups] i2c: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 417e5bf879988bcd61adde878254f9ecf9015052 Gitweb: https://git.kernel.org/tip/417e5bf879988bcd61adde878254f9ecf9015052 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:12 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
i2c: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-cht-wc.c +1 -1
@@ -467,7 +467,7 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev)return ret;/* Alloc and register client IRQ */ - adap->irq_domain =irq_domain_add_linear (NULL ,1 , &irq_domain_simple_ops,NULL ); + adap->irq_domain =irq_domain_create_linear (NULL ,1 , &irq_domain_simple_ops,NULL );if (!adap->irq_domain)return -ENOMEM ;
drivers/i2c/muxes/i2c-mux-pca954x.c +3 -3
@@ -442,9 +442,9 @@ static int pca954x_irq_setup(struct i2c_mux_core *muxc)raw_spin_lock_init (&data->lock); - data->irq =irq_domain_add_linear (client->dev.of_node, - data->chip->nchans, - &irq_domain_simple_ops, data); + data->irq =irq_domain_create_linear (of_fwnode_handle (client->dev.of_node), + data->chip->nchans, + &irq_domain_simple_ops, data);if (!data->irq)return -ENODEV ;
[tip: irq/cleanups] i2c: Switch to irq_domain_create_linear()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 3fd83ff1d9232efb0953b720086e6a9e02ecb166 Gitweb: https://git.kernel.org/tip/3fd83ff1d9232efb0953b720086e6a9e02ecb166 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:12 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:09 +02:00
i2c: Switch to irq_domain_create_linear()
irq_domain_add_linear() is going away as being obsolete now. Switch to the preferred irq_domain_create_linear(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-cht-wc.c +1 -1
@@ -467,7 +467,7 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev)return ret;/* Alloc and register client IRQ */ - adap->irq_domain =irq_domain_add_linear (NULL ,1 , &irq_domain_simple_ops,NULL ); + adap->irq_domain =irq_domain_create_linear (NULL ,1 , &irq_domain_simple_ops,NULL );if (!adap->irq_domain)return -ENOMEM ;
drivers/i2c/muxes/i2c-mux-pca954x.c +3 -3
@@ -442,9 +442,9 @@ static int pca954x_irq_setup(struct i2c_mux_core *muxc)raw_spin_lock_init (&data->lock); - data->irq =irq_domain_add_linear (client->dev.of_node, - data->chip->nchans, - &irq_domain_simple_ops, data); + data->irq =irq_domain_create_linear (of_fwnode_handle (client->dev.of_node), + data->chip->nchans, + &irq_domain_simple_ops, data);if (!data->irq)return -ENODEV ;
PATCH v2 20/57 irqdomain: iio: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
--- drivers/iio/adc/stm32-adc-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/adc/stm32-adc-core.c +4 -3
@@ -421,9 +421,10 @@ static int stm32_adc_irq_probe(struct platform_device *pdev,return priv->irq[i]; } - priv->domain =irq_domain_add_simple (np,STM32_ADC_MAX_ADCS ,0 , - &stm32_adc_domain_ops, - priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +STM32_ADC_MAX_ADCS ,0 , + &stm32_adc_domain_ops, + priv);if (!priv->domain) {dev_err (&pdev->dev,"Failed to add irq domain\n" );return -ENOMEM ;
Signature · 1 line
2.49.0
[tip: irq/cleanups] iio: Switch to irq_domain_create_simple()
The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 344471d8f3bd78cbc8fecbc94be6fff6e490cc29 Gitweb: https://git.kernel.org/tip/344471d8f3bd78cbc8fecbc94be6fff6e490cc29 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:13 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Tue, 06 May 2025 14:59:05 +02:00
iio: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/iio/adc/stm32-adc-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/adc/stm32-adc-core.c +4 -3
@@ -421,9 +421,10 @@ static int stm32_adc_irq_probe(struct platform_device *pdev,return priv->irq[i]; } - priv->domain =irq_domain_add_simple (np,STM32_ADC_MAX_ADCS ,0 , - &stm32_adc_domain_ops, - priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +STM32_ADC_MAX_ADCS ,0 , + &stm32_adc_domain_ops, + priv);if (!priv->domain) {dev_err (&pdev->dev,"Failed to add irq domain\n" );return -ENOMEM ;
[tip: irq/cleanups] iio: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: b05c04edb4f82fbb3a031d65e39c148d80cb2db0 Gitweb: https://git.kernel.org/tip/b05c04edb4f82fbb3a031d65e39c148d80cb2db0 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:13 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 07 May 2025 09:53:22 +02:00
iio: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/iio/adc/stm32-adc-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/adc/stm32-adc-core.c +4 -3
@@ -421,9 +421,10 @@ static int stm32_adc_irq_probe(struct platform_device *pdev,return priv->irq[i]; } - priv->domain =irq_domain_add_simple (np,STM32_ADC_MAX_ADCS ,0 , - &stm32_adc_domain_ops, - priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +STM32_ADC_MAX_ADCS ,0 , + &stm32_adc_domain_ops, + priv);if (!priv->domain) {dev_err (&pdev->dev,"Failed to add irq domain\n" );return -ENOMEM ;
[tip: irq/cleanups] iio: Switch to irq_domain_create_simple()
In reply to Jiri Slaby (SUSE)The following commit has been merged into the irq/cleanups branch of tip:
The following commit has been merged into the irq/cleanups branch of tip:
Commit-ID: 7f68126a8766773a403ff754bd2cbce0df2306f6 Gitweb: https://git.kernel.org/tip/7f68126a8766773a403ff754bd2cbce0df2306f6 Author: Jiri Slaby (SUSE) <[email protected]> AuthorDate: Wed, 19 Mar 2025 10:29:13 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 16 May 2025 21:06:09 +02:00
iio: Switch to irq_domain_create_simple()
irq_domain_add_simple() is going away as being obsolete now. Switch to the preferred irq_domain_create_simple(). That differs in the first
parameter: It takes more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the parameter.
Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW).
[ tglx: Fix up subject prefix ]
--- drivers/iio/adc/stm32-adc-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iio/adc/stm32-adc-core.c +4 -3
@@ -421,9 +421,10 @@ static int stm32_adc_irq_probe(struct platform_device *pdev,return priv->irq[i]; } - priv->domain =irq_domain_add_simple (np,STM32_ADC_MAX_ADCS ,0 , - &stm32_adc_domain_ops, - priv); + priv->domain =irq_domain_create_simple (of_fwnode_handle (np), +STM32_ADC_MAX_ADCS ,0 , + &stm32_adc_domain_ops, + priv);if (!priv->domain) {dev_err (&pdev->dev,"Failed to add irq domain\n" );return -ENOMEM ;