sugar/linux
1
0
Fork 0
Code Activity

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

Browse Source 
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"
This commit is contained in:
Linus Torvalds
2025-10-12 13:27:56 -07:00
parent 8765f46791 a8482d2c90
commit 3dd7b81235
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/i2c/i2c-boardinfo.c
View File

@@ -22,7 +22,7 @@ EXPORT_SYMBOL_GPL(__i2c_board_lock);
LIST_HEAD(__i2c_board_list); LIST_HEAD(__i2c_board_list);
EXPORT_SYMBOL_GPL(__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); 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 * 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. * 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; int status;

2
include/linux/i2c.h
View File

@@ -499,7 +499,7 @@ static inline struct i2c_client *i2c_verify_client(struct device *dev)
* Modules for add-on boards must use other calls. * Modules for add-on boards must use other calls.
*/ */
#ifdef CONFIG_I2C_BOARDINFO #ifdef CONFIG_I2C_BOARDINFO
int __init int
i2c_register_board_info(int busnum, struct i2c_board_info const *info, i2c_register_board_info(int busnum, struct i2c_board_info const *info,
unsigned n); unsigned n);
#else #else