Commit 3dd7b812 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.18-rc1-hotfix' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fix from Wolfram Sang:
 "One revert because of a regression in the I2C core which has sadly not
  showed up during its time in -next"

* tag 'i2c-for-6.18-rc1-hotfix' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  Revert "i2c: boardinfo: Annotate code used in init phase only"
parents 8765f467 a8482d2c

drivers/i2c/i2c-boardinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ EXPORT_SYMBOL_GPL(__i2c_board_lock); 
LIST_HEAD(__i2c_board_list);

EXPORT_SYMBOL_GPL(__i2c_board_list);



int __i2c_first_dynamic_bus_num __ro_after_init;

int __i2c_first_dynamic_bus_num;

EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num);
@@ -48,7 +48,7 @@ EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num); 
 * The board info passed can safely be __initdata, but be careful of embedded

 * pointers (for platform_data, functions, etc) since that won't be copied.

 */

int __init i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len)

int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len)

{

	int status;

include/linux/i2c.h

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static inline struct i2c_client *i2c_verify_client(struct device *dev) 
 * Modules for add-on boards must use other calls.

 */

#ifdef CONFIG_I2C_BOARDINFO

int __init

int

i2c_register_board_info(int busnum, struct i2c_board_info const *info,

			unsigned n);

#else