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

i2c: core: Drop duplicate check before calling OF APIs 



OF APIs are usually NULL-aware and return an error in case when
device node is not present or supported. We already have a check
for the returned value, no need to check for the parameter.

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 8ffd015d

drivers/i2c/i2c-core-base.c

+7 −11
Original line number Diff line number Diff line
@@ -1209,11 +1209,9 @@ struct i2c_client *i2c_new_ancillary_device(struct i2c_client *client, 
	u32 addr = default_addr;

	int i;



	if (np) {

	i = of_property_match_string(np, "reg-names", name);

	if (i >= 0)

		of_property_read_u32_index(np, "reg", i, &addr);

	}



	dev_dbg(&client->adapter->dev, "Address for %s : 0x%x\n", name, addr);

	return i2c_new_dummy_device(client->adapter, addr);
@@ -1651,13 +1649,11 @@ int i2c_add_adapter(struct i2c_adapter *adapter) 
	struct device *dev = &adapter->dev;

	int id;



	if (dev->of_node) {

	id = of_alias_get_id(dev->of_node, "i2c");

	if (id >= 0) {

		adapter->nr = id;

		return __i2c_add_numbered_adapter(adapter);

	}

	}



	mutex_lock(&core_lock);

	id = idr_alloc(&i2c_adapter_idr, adapter,