From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795059719; b=EiEdRNptp+UvHdPIxQ9207T2GhrDl/V8c817ZwQYs5+GU4B25A4HT9CSv+7+kn9wfLHb rVn7Gv4za4Xc14TxolcspYFXjRl7QzSyjYz5D9waSPQmEq9iVbv6WDRjCZa1mmtummQxu 4wa1CIKpDooEU4im/S2SSp4yI1U6UNDRG2hCx1Yui4hwczCxwR2sIaWFYlTybBof5o1v6 3zWBB+EAvxTTFEryZ63GYWxO+fqWEIiIBUAvL9fAI6SFUNQ/R6FJaR46aoHBuEUykYIMp iESectM/UQuucfer5mgpZM/zxEmPSO/TlddoQdNUcylcOO3Gu6+yrdh4ge/rfF2Ikbw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795059719; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=zqe2R4b9beR8xtzWRFAy0leUN79sJi0zJGqTzQvf2jE=; b=LtHQ/yn2Mfo2xagqoAFARN1STPxYoQzZOKocwFPPnlA+1tEuymaHlXW9RFMXWn+lqQF8 LIVKDdQ8rjdr7sRhAObmB3aMxKm0xyM93tjcrdQIJ9ZqD4/J7fS91HDoAowoEo1rJm1+4 gg1afFdYHW7Md8PaQnDGgegpGV3DdvuQlsFOF3g0GBXWrHvJeDOa3kekneoej28OwhGaB AancOpFnFCzu3E/ikl9kC7wz/++uypoLieE2iVuU0rimdboGHGJ9zlDzYpSd4th2yJ+Zx FZlcGX6IpJXpRL9qN4RgHPTzKd77TRX3aO2rPP3FBzCVWlZ7txvMbIWHnbdSvOHi4rA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="NkQm/prI"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73C8A606A325; Thu, 19 Nov 2026 03:41:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NkQm/prI Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB8A91F000C4; Thu, 19 Nov 2026 03:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795059719; bh=zqe2R4b9beR8xtzWRFAy0leUN79sJi0zJGqTzQvf2jE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NkQm/prI9fE+lvHAhtBcMR2zPQ3hKQ9xUglDZCMEna9dkT5vSLB5MD+RP+H01bFYO WyoJagPGYf8MnYklbeCp5eG9sLFA/jVify9V3heL/KHG3/R76KQ3tQqDpDkAzDzeBf KQvSfyz7o9O1T7NKzH0E8uZS7OQz1Sn0dkZ+M5XE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , Mika Westerberg , Wolfram Sang , Hans de Goede , Sasha Levin Subject: [PATCH 5.10 0943/1848] i2c: acpi: Add i2c_acpi_new_device_by_fwnode() function Date: Wed, 18 Nov 2026 15:49:41 +0100 Message-ID: <20261118145956.502373320@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede [ Upstream commit c537be0bfad6337f2afd618fe252c03217191405 ] Change i2c_acpi_new_device() into i2c_acpi_new_device_by_fwnode() and add a static inline wrapper providing the old i2c_acpi_new_device() behavior. This is necessary because in some cases we may only have access to the fwnode / acpi_device and not to the matching physical-node struct device *. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Acked-by: Mika Westerberg Acked-by: Wolfram Sang Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20211203102857.44539-4-hdegoede@redhat.com Stable-dep-of: a65917d0a22f ("i2c: acpi: Fix adapter reference leak in i2c_acpi_new_device_by_fwnode()") Signed-off-by: Sasha Levin --- drivers/i2c/i2c-core-acpi.c | 17 +++++++++++------ include/linux/i2c.h | 17 +++++++++++++---- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index 2f180862dbec9..6f8532ccea850 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -473,8 +473,8 @@ struct notifier_block i2c_acpi_notifier = { }; /** - * i2c_acpi_new_device - Create i2c-client for the Nth I2cSerialBus resource - * @dev: Device owning the ACPI resources to get the client from + * i2c_acpi_new_device_by_fwnode - Create i2c-client for the Nth I2cSerialBus resource + * @fwnode: fwnode with the ACPI resources to get the client from * @index: Index of ACPI resource to get * @info: describes the I2C device; note this is modified (addr gets set) * Context: can sleep @@ -490,15 +490,20 @@ struct notifier_block i2c_acpi_notifier = { * Returns a pointer to the new i2c-client, or error pointer in case of failure. * Specifically, -EPROBE_DEFER is returned if the adapter is not found. */ -struct i2c_client *i2c_acpi_new_device(struct device *dev, int index, - struct i2c_board_info *info) +struct i2c_client *i2c_acpi_new_device_by_fwnode(struct fwnode_handle *fwnode, + int index, + struct i2c_board_info *info) { - struct acpi_device *adev = ACPI_COMPANION(dev); struct i2c_acpi_lookup lookup; struct i2c_adapter *adapter; + struct acpi_device *adev; LIST_HEAD(resource_list); int ret; + adev = to_acpi_device_node(fwnode); + if (!adev) + return ERR_PTR(-ENODEV); + memset(&lookup, 0, sizeof(lookup)); lookup.info = info; lookup.device_handle = acpi_device_handle(adev); @@ -520,7 +525,7 @@ struct i2c_client *i2c_acpi_new_device(struct device *dev, int index, return i2c_new_client_device(adapter, info); } -EXPORT_SYMBOL_GPL(i2c_acpi_new_device); +EXPORT_SYMBOL_GPL(i2c_acpi_new_device_by_fwnode); #ifdef CONFIG_ACPI_I2C_OPREGION static int acpi_gsb_i2c_read_bytes(struct i2c_client *client, diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 93eacd3844d19..a10a7072b583d 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -998,8 +998,9 @@ struct acpi_resource_i2c_serialbus; bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, struct acpi_resource_i2c_serialbus **i2c); u32 i2c_acpi_find_bus_speed(struct device *dev); -struct i2c_client *i2c_acpi_new_device(struct device *dev, int index, - struct i2c_board_info *info); +struct i2c_client *i2c_acpi_new_device_by_fwnode(struct fwnode_handle *fwnode, + int index, + struct i2c_board_info *info); struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle); #else static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, @@ -1011,8 +1012,9 @@ static inline u32 i2c_acpi_find_bus_speed(struct device *dev) { return 0; } -static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, - int index, struct i2c_board_info *info) +static inline struct i2c_client *i2c_acpi_new_device_by_fwnode( + struct fwnode_handle *fwnode, int index, + struct i2c_board_info *info) { return ERR_PTR(-ENODEV); } @@ -1022,4 +1024,11 @@ static inline struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle ha } #endif /* CONFIG_ACPI */ +static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, + int index, + struct i2c_board_info *info) +{ + return i2c_acpi_new_device_by_fwnode(dev_fwnode(dev), index, info); +} + #endif /* _LINUX_I2C_H */ -- 2.53.0