Commit 390fd047 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: remove deprecated i2c_new_device API 



All in-tree users have been converted to the new i2c_new_client_device
function, so remove this deprecated one.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent bc5a3e44

drivers/i2c/i2c-core-base.c

+0 −25
Original line number Diff line number Diff line
@@ -815,31 +815,6 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf 
}

EXPORT_SYMBOL_GPL(i2c_new_client_device);



/**

 * i2c_new_device - instantiate an i2c device

 * @adap: the adapter managing the device

 * @info: describes one I2C device; bus_num is ignored

 * Context: can sleep

 *

 * This deprecated function has the same functionality as

 * @i2c_new_client_device, it just returns NULL instead of an ERR_PTR in case of

 * an error for compatibility with current I2C API. It will be removed once all

 * users are converted.

 *

 * This returns the new i2c client, which may be saved for later use with

 * i2c_unregister_device(); or NULL to indicate an error.

 */

struct i2c_client *

i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)

{

	struct i2c_client *ret;



	ret = i2c_new_client_device(adap, info);

	return IS_ERR(ret) ? NULL : ret;

}

EXPORT_SYMBOL_GPL(i2c_new_device);





/**

 * i2c_unregister_device - reverse effect of i2c_new_*_device()

 * @client: value returned from i2c_new_*_device()

include/linux/i2c.h

+3 −5
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static inline bool i2c_detect_slave_mode(struct device *dev) { return false; } 
 * that are present.  This information is used to grow the driver model tree.

 * For mainboards this is done statically using i2c_register_board_info();

 * bus numbers identify adapters that aren't yet available.  For add-on boards,

 * i2c_new_device() does this dynamically with the adapter already known.

 * i2c_new_client_device() does this dynamically with the adapter already known.

 */

struct i2c_board_info {

	char		type[I2C_NAME_SIZE];
@@ -439,13 +439,11 @@ struct i2c_board_info { 




#if IS_ENABLED(CONFIG_I2C)

/* Add-on boards should register/unregister their devices; e.g. a board

/*

 * Add-on boards should register/unregister their devices; e.g. a board

 * with integrated I2C, a config eeprom, sensors, and a codec that's

 * used in conjunction with the primary hardware.

 */

struct i2c_client *

i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info);



struct i2c_client *

i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *info);