Commit 3435b7f0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang
Browse files

i2c: core: Reuse fwnode variable where it makes sense 



Reuse fwnode variable where it makes sense. This avoids unneeded
duplication hidden in some macros and unifies the code for different
types of fwnode.

Tested-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent 5d9424b0

drivers/i2c/i2c-core-base.c

+3 −3
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static int i2c_device_probe(struct device *dev) 


	dev_dbg(dev, "probe\n");



	status = of_clk_set_defaults(dev->of_node, false);

	status = of_clk_set_defaults(to_of_node(fwnode), false);

	if (status < 0)

		goto err_clear_wakeup_irq;
@@ -1061,10 +1061,10 @@ void i2c_unregister_device(struct i2c_client *client) 


	fwnode = dev_fwnode(&client->dev);

	if (is_of_node(fwnode)) {

		of_node_clear_flag(client->dev.of_node, OF_POPULATED);

		of_node_clear_flag(to_of_node(fwnode), OF_POPULATED);

		of_node_put(client->dev.of_node);

	} else if (is_acpi_device_node(fwnode)) {

		acpi_device_clear_enumerated(ACPI_COMPANION(&client->dev));

		acpi_device_clear_enumerated(to_acpi_device_node(fwnode));

	}



	device_remove_software_node(&client->dev);