@@ -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) {
No client sets 'of_node' anymore, so we don't need to handle the case in the core anymore. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/i2c-core-base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)