Skip to content

Commit f67b89b

Browse files
author
Wolfram Sang
committed
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 <andi.shyti@kernel.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
1 parent 89b4fb2 commit f67b89b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/i2c/i2c-core-base.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ static void i2c_unlock_addr(struct i2c_adapter *adap, unsigned short addr,
961961
struct i2c_client *
962962
i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
963963
{
964-
struct fwnode_handle *fwnode;
964+
struct fwnode_handle *fwnode = info->fwnode;
965965
struct i2c_client *client;
966966
bool need_put = false;
967967
int status;
@@ -1005,7 +1005,6 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
10051005

10061006
device_enable_async_suspend(&client->dev);
10071007

1008-
fwnode = info->fwnode ?: of_fwnode_handle(info->of_node);
10091008
device_set_node(&client->dev, fwnode_handle_get(fwnode));
10101009

10111010
if (info->swnode) {

0 commit comments

Comments
 (0)