History

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang: "Three more driver bugfixes, and two doc improvements fixing build warnings while we are here" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: pca-platform: Use platform_irq_get_optional i2c: st: fix missing struct parameter description i2c: nvidia-gpu: Handle timeout correctly in gpu_i2c_check_status() i2c: fix a doc warning i2c: hix5hd2: add missed clk_disable_unprepare in remove

Linus Torvalds committed 6 years ago

Commit 906c4042 parents 83fd69c 14c1fe65 files · +13 −15Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/i2c.h+2−2
@@ -506,7 +506,7 @@ i2c_register_board_info(int busnum, struct i2c_board_info const *info, · 505 unmodified lines
506 * @smbus_xfer_atomic: same as @smbus_xfer. Yet, only using atomic context506 * @smbus_xfer_atomic: same as @smbus_xfer. Yet, only using atomic context
507 * so e.g. PMICs can be accessed very late before shutdown. Optional.507 * so e.g. PMICs can be accessed very late before shutdown. Optional.
508 * @functionality: Return the flags that this algorithm/adapter pair supports508 * @functionality: Return the flags that this algorithm/adapter pair supports
509 * from the I2C_FUNC_* flags.509 * from the ``I2C_FUNC_*`` flags.
510 * @reg_slave: Register given client to I2C slave mode of this adapter510 * @reg_slave: Register given client to I2C slave mode of this adapter
511 * @unreg_slave: Unregister given client from I2C slave mode of this adapter511 * @unreg_slave: Unregister given client from I2C slave mode of this adapter
512 *512 *
@@ -515,7 +515,7 @@ i2c_register_board_info(int busnum, struct i2c_board_info const *info, · 2 unmodified lines
515 * be addressed using the same bus algorithms - i.e. bit-banging or the PCF8584515 * be addressed using the same bus algorithms - i.e. bit-banging or the PCF8584
516 * to name two of the most common.516 * to name two of the most common.
517 *517 *
518 * The return codes from the @master_xfer{_atomic} fields should indicate the518 * The return codes from the ``master_xfer{_atomic}`` fields should indicate the
519 * type of error code that occurred during the transfer, as documented in the519 * type of error code that occurred during the transfer, as documented in the
520 * Kernel Documentation file Documentation/i2c/fault-codes.rst.520 * Kernel Documentation file Documentation/i2c/fault-codes.rst.
521 */521 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t