From ad10d480701475c8e369e81b6051e7e22ea73b9d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 30 Dec 2024 11:12:06 +0000 Subject: [PATCH] Revert "i3c: master: fix kernel-doc check warning" This reverts commit 4c135c0a52d75d2914dbe444bd3338daa70cacdf which is commit 34d946b723b53488ab39d8ac540ddf9db255317a upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Iae13a40d3026c6ac7c352f00ff6e80bb332ddecd Signed-off-by: Greg Kroah-Hartman --- include/linux/i3c/master.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h index b6cbd00773a3..b5a568caf4c8 100644 --- a/include/linux/i3c/master.h +++ b/include/linux/i3c/master.h @@ -425,8 +425,6 @@ struct i3c_bus { * for a future IBI * This method is mandatory only if ->request_ibi is not * NULL. - * @enable_hotjoin: enable hot join event detect. - * @disable_hotjoin: disable hot join event detect. */ struct i3c_master_controller_ops { int (*bus_init)(struct i3c_master_controller *master); @@ -468,7 +466,6 @@ struct i3c_master_controller_ops { * @ops: master operations. See &struct i3c_master_controller_ops * @secondary: true if the master is a secondary master * @init_done: true when the bus initialization is done - * @hotjoin: true if the master support hotjoin * @boardinfo.i3c: list of I3C boardinfo objects * @boardinfo.i2c: list of I2C boardinfo objects * @boardinfo: board-level information attached to devices connected on the bus