From nobody Thu Dec 18 13:48:51 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26BEC1EEA26 for ; Wed, 15 Jan 2025 08:54:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736931272; cv=none; b=HSySL4HA0X5ZahDsvwF2kKHfE4TUILEh9X9Xriutzyi0yqTLHZ2JLjToz0KHEIBL0JpS1yDjghFe5PDhcJE90Q3RnMrTkVXfJZNLSfVqSKuxDf/MFS6j6l2Xm87RugqHUZrWPoFF/BF9NK7E64CLukjr9p3ZPKSWG6LSVpevDno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736931272; c=relaxed/simple; bh=0rCsOIR+0/dkSLLi8pxxpmFc72kNwJkboss+iwAqD/g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UQxVWiHAvioDdHvl42oTfGNu1AKhLRZoflx9qHjX4JvDVr/m+BusBkRALq1KIAcS8+6E7Zj67ZSJpy1+R8gNWlKlA0EaLk28RH4V7io3B1UbZLzD6qH47Sxhb7bzIji8dqVBgs/dlQZt94B1Cx4jYUdzLd+1X9767kT43K09CK4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VOmK5VP9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VOmK5VP9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA548C4CEE1; Wed, 15 Jan 2025 08:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736931271; bh=0rCsOIR+0/dkSLLi8pxxpmFc72kNwJkboss+iwAqD/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VOmK5VP9dkM1ZSp0wJ6ibc3EVpZGnURPa6n+TyTQCo2T2VxBr/XL6xu/ueKJFbkuU k2lhrNj2ERsnzwAbt1rzp9dMbmsQD+qrlbHvWbWN7NOk5lUSIxGzE2r1OKH9KNbpo/ /93CFRpc3t2GE6yZxXK55/9PciZpEtWkX/niwmSsmm+gon+5ZYSAQZNce0yS+A5sl9 F3G56/QDxOajiit5f2qNOZlkDvr+P3t89nnEfUJFng6BVStCLUdQKlJig470eUqRkG LM3f+hfz0/42t23+cEIj9qGCsXE+EIhqJKGp3xCQT5GOcKP8YTa1ojsPp0EDYumg9m ikWBFsW6bST0Q== From: "Jiri Slaby (SUSE)" To: tglx@linutronix.de Cc: maz@kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH 11/18] irqdomain: Rename _instantiate functions to _add Date: Wed, 15 Jan 2025 09:54:00 +0100 Message-ID: <20250115085409.1629787-12-jirislaby@kernel.org> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250115085409.1629787-1-jirislaby@kernel.org> References: <20250115085409.1629787-1-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Continuing the unifying idea of previous patches, all "_instantiate" functions are renamed to "_add". Now, the interface is: * dom =3D irq_domain_add(info) * irq_domain_remove(dom) Signed-off-by: Jiri Slaby (SUSE) --- arch/um/drivers/virt-pci.c | 2 +- drivers/base/regmap/regmap-irq.c | 2 +- drivers/irqchip/irq-lan966x-oic.c | 2 +- include/linux/irqdomain.h | 16 ++++++++-------- kernel/irq/devres.c | 8 ++++---- kernel/irq/irqdomain.c | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c index 744e7f31e8ef..1de5407a189c 100644 --- a/arch/um/drivers/virt-pci.c +++ b/arch/um/drivers/virt-pci.c @@ -1023,7 +1023,7 @@ static int __init um_pci_init(void) } =20 inner_domain_info.fwnode =3D um_pci_fwnode; - um_pci_inner_domain =3D irq_domain_instantiate(&inner_domain_info); + um_pci_inner_domain =3D irq_domain_add(&inner_domain_info); if (IS_ERR(um_pci_inner_domain)) { err =3D PTR_ERR(um_pci_inner_domain); goto free; diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-= irq.c index 0bcd81389a29..e58cb6b9c3bc 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -623,7 +623,7 @@ static int regmap_irq_create_domain(struct fwnode_handl= e *fwnode, int irq_base, .name_suffix =3D chip->domain_suffix, }; =20 - d->domain =3D irq_domain_instantiate(&info); + d->domain =3D irq_domain_add(&info); if (IS_ERR(d->domain)) { dev_err(d->map->dev, "Failed to create IRQ domain\n"); return PTR_ERR(d->domain); diff --git a/drivers/irqchip/irq-lan966x-oic.c b/drivers/irqchip/irq-lan966= x-oic.c index 9445c3a6b1b0..fd29bc6611a5 100644 --- a/drivers/irqchip/irq-lan966x-oic.c +++ b/drivers/irqchip/irq-lan966x-oic.c @@ -251,7 +251,7 @@ static int lan966x_oic_probe(struct platform_device *pd= ev) return dev_err_probe(dev, lan966x_oic->irq, "failed to get the IRQ\n"); =20 d_info.host_data =3D lan966x_oic; - domain =3D devm_irq_domain_instantiate(dev, &d_info); + domain =3D devm_irq_domain_add(dev, &d_info); if (IS_ERR(domain)) return dev_err_probe(dev, PTR_ERR(domain), "failed to instantiate the IRQ domain\n"); diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index 00a0bf2c0942..0a48cdd5f981 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -329,8 +329,8 @@ struct irq_domain_info { void (*exit)(struct irq_domain *d); }; =20 -struct irq_domain *irq_domain_instantiate(const struct irq_domain_info *in= fo); -struct irq_domain *devm_irq_domain_instantiate(struct device *dev, +struct irq_domain *irq_domain_add(const struct irq_domain_info *info); +struct irq_domain *devm_irq_domain_add(struct device *dev, const struct irq_domain_info *info); =20 struct irq_domain *irq_domain_add_simple_fwnode(struct fwnode_handle *fwno= de, @@ -445,7 +445,7 @@ static inline struct irq_domain *irq_domain_add_linear_= of_node(struct device_nod .ops =3D ops, .host_data =3D host_data, }; - struct irq_domain *d =3D irq_domain_instantiate(&info); + struct irq_domain *d =3D irq_domain_add(&info); =20 return IS_ERR(d) ? NULL : d; } @@ -463,7 +463,7 @@ static inline struct irq_domain *irq_domain_add_nomap_o= f_node(struct device_node .ops =3D ops, .host_data =3D host_data, }; - struct irq_domain *d =3D irq_domain_instantiate(&info); + struct irq_domain *d =3D irq_domain_add(&info); =20 return IS_ERR(d) ? NULL : d; } @@ -481,7 +481,7 @@ static inline struct irq_domain *irq_domain_add_tree_of= _node(struct device_node .ops =3D ops, .host_data =3D host_data, }; - struct irq_domain *d =3D irq_domain_instantiate(&info); + struct irq_domain *d =3D irq_domain_add(&info); =20 return IS_ERR(d) ? NULL : d; } @@ -498,7 +498,7 @@ static inline struct irq_domain *irq_domain_add_linear_= fwnode(struct fwnode_hand .ops =3D ops, .host_data =3D host_data, }; - struct irq_domain *d =3D irq_domain_instantiate(&info); + struct irq_domain *d =3D irq_domain_add(&info); =20 return IS_ERR(d) ? NULL : d; } @@ -513,7 +513,7 @@ static inline struct irq_domain *irq_domain_add_tree_fw= node(struct fwnode_handle .ops =3D ops, .host_data =3D host_data, }; - struct irq_domain *d =3D irq_domain_instantiate(&info); + struct irq_domain *d =3D irq_domain_add(&info); =20 return IS_ERR(d) ? NULL : d; } @@ -638,7 +638,7 @@ static inline struct irq_domain *irq_domain_add_hierarc= hy_fwnode(struct irq_doma .domain_flags =3D flags, .parent =3D parent, }; - struct irq_domain *d =3D irq_domain_instantiate(&info); + struct irq_domain *d =3D irq_domain_add(&info); =20 return IS_ERR(d) ? NULL : d; } diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c index eb16a58e0322..7c21b0c8a687 100644 --- a/kernel/irq/devres.c +++ b/kernel/irq/devres.c @@ -292,7 +292,7 @@ static void devm_irq_domain_remove(struct device *dev, = void *res) } =20 /** - * devm_irq_domain_instantiate() - Instantiate a new irq domain data for a + * devm_irq_domain_add() - Instantiate a new irq domain data for a * managed device. * @dev: Device to instantiate the domain for * @info: Domain information pointer pointing to the information for this @@ -300,7 +300,7 @@ static void devm_irq_domain_remove(struct device *dev, = void *res) * * Return: A pointer to the instantiated irq domain or an ERR_PTR value. */ -struct irq_domain *devm_irq_domain_instantiate(struct device *dev, +struct irq_domain *devm_irq_domain_add(struct device *dev, const struct irq_domain_info *info) { struct irq_domain *domain; @@ -310,7 +310,7 @@ struct irq_domain *devm_irq_domain_instantiate(struct d= evice *dev, if (!dr) return ERR_PTR(-ENOMEM); =20 - domain =3D irq_domain_instantiate(info); + domain =3D irq_domain_add(info); if (!IS_ERR(domain)) { *dr =3D domain; devres_add(dev, dr); @@ -320,5 +320,5 @@ struct irq_domain *devm_irq_domain_instantiate(struct d= evice *dev, =20 return domain; } -EXPORT_SYMBOL_GPL(devm_irq_domain_instantiate); +EXPORT_SYMBOL_GPL(devm_irq_domain_add); #endif /* CONFIG_IRQ_DOMAIN */ diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 2d5f716887d9..ddacf9487d08 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -305,8 +305,8 @@ static void irq_domain_instantiate_descs(const struct i= rq_domain_info *info) } } =20 -static struct irq_domain *__irq_domain_instantiate(const struct irq_domain= _info *info, - bool cond_alloc_descs, bool force_associate) +static struct irq_domain *__irq_domain_add(const struct irq_domain_info *i= nfo, + bool cond_alloc_descs, bool force_associate) { struct irq_domain *domain; int err; @@ -363,16 +363,16 @@ static struct irq_domain *__irq_domain_instantiate(co= nst struct irq_domain_info } =20 /** - * irq_domain_instantiate() - Instantiate a new irq domain data structure + * irq_domain_add() - Instantiate a new irq domain data structure * @info: Domain information pointer pointing to the information for this = domain * * Return: A pointer to the instantiated irq domain or an ERR_PTR value. */ -struct irq_domain *irq_domain_instantiate(const struct irq_domain_info *in= fo) +struct irq_domain *irq_domain_add(const struct irq_domain_info *info) { - return __irq_domain_instantiate(info, false, false); + return __irq_domain_add(info, false, false); } -EXPORT_SYMBOL_GPL(irq_domain_instantiate); +EXPORT_SYMBOL_GPL(irq_domain_add); =20 /** * irq_domain_remove() - Remove an irq domain. @@ -474,7 +474,7 @@ struct irq_domain *irq_domain_add_simple_fwnode(struct = fwnode_handle *fwnode, .ops =3D ops, .host_data =3D host_data, }; - struct irq_domain *domain =3D __irq_domain_instantiate(&info, true, false= ); + struct irq_domain *domain =3D __irq_domain_add(&info, true, false); =20 return IS_ERR(domain) ? NULL : domain; } @@ -496,7 +496,7 @@ struct irq_domain *irq_domain_add_legacy_fwnode(struct = fwnode_handle *fwnode, .ops =3D ops, .host_data =3D host_data, }; - struct irq_domain *domain =3D __irq_domain_instantiate(&info, false, true= ); + struct irq_domain *domain =3D __irq_domain_add(&info, false, true); =20 return IS_ERR(domain) ? NULL : domain; } --=20 2.48.0