Commit e0c7800a authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge branch 'i2c/client_device_id_helper-immutable' into i2c/for-mergewindow

parents e826192c 66223373

drivers/i2c/i2c-core-base.c

+14 −0
Original line number Diff line number Diff line
@@ -2236,6 +2236,20 @@ int i2c_get_device_id(const struct i2c_client *client, 
}

EXPORT_SYMBOL_GPL(i2c_get_device_id);



/**

 * i2c_client_get_device_id - get the driver match table entry of a device

 * @client: the device to query. The device must be bound to a driver

 *

 * Returns a pointer to the matching entry if found, NULL otherwise.

 */

const struct i2c_device_id *i2c_client_get_device_id(const struct i2c_client *client)

{

	const struct i2c_driver *drv = to_i2c_driver(client->dev.driver);



	return i2c_match_id(drv->id_table, client);

}

EXPORT_SYMBOL_GPL(i2c_client_get_device_id);



/* ----------------------------------------------------

 * the i2c address scanning function

 * Will not work for 10-bit addresses!

include/linux/i2c.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ s32 i2c_smbus_read_i2c_block_data_or_emulated(const struct i2c_client *client, 
					      u8 *values);

int i2c_get_device_id(const struct i2c_client *client,

		      struct i2c_device_identity *id);

const struct i2c_device_id *i2c_client_get_device_id(const struct i2c_client *client);

#endif /* I2C */



/**