From f67b89b6dae3e0db447bd3bbbb6c64be5beea8ee Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Mon, 19 May 2025 13:13:13 +0200 Subject: [PATCH] i2c: use only 'fwnode' for client devices No client sets 'of_node' anymore, so we don't need to handle the case in the core anymore. Reviewed-by: Andi Shyti Reviewed-by: Andy Shevchenko Signed-off-by: Wolfram Sang --- drivers/i2c/i2c-core-base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 32ffd12bff9fc..5f6ff35a27071 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -961,7 +961,7 @@ static void i2c_unlock_addr(struct i2c_adapter *adap, unsigned short addr, struct i2c_client * i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *info) { - struct fwnode_handle *fwnode; + struct fwnode_handle *fwnode = info->fwnode; struct i2c_client *client; bool need_put = false; int status; @@ -1005,7 +1005,6 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf device_enable_async_suspend(&client->dev); - fwnode = info->fwnode ?: of_fwnode_handle(info->of_node); device_set_node(&client->dev, fwnode_handle_get(fwnode)); if (info->swnode) { -- 2.39.5