There are no users of struct spi_replaced_transfers and the spi_replaced_release_t typedef apart from spi.c. So move their definition there to not clutter the public namespace. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> --- drivers/spi/spi.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/spi/spi.h | 36 ------------------------------------ 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 50591de16e0f..e73498e6dee5 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3115,6 +3115,40 @@ EXPORT_SYMBOL_GPL(spi_controller_resume); /* Core methods for spi_message alterations */ +struct spi_replaced_transfers; +typedef void (*spi_replaced_release_t)(struct spi_controller *ctlr, + struct spi_message *msg, + struct spi_replaced_transfers *res); +/** + * struct spi_replaced_transfers - structure describing the spi_transfer + * replacements that have occurred + * so that they can get reverted + * @release: some extra release code to get executed prior to + * relasing this structure + * @extradata: pointer to some extra data if requested or NULL + * @replaced_transfers: transfers that have been replaced and which need + * to get restored + * @replaced_after: the transfer after which the @replaced_transfers + * are to get re-inserted + * @inserted: number of transfers inserted + * @inserted_transfers: array of spi_transfers of array-size @inserted, + * that have been replacing replaced_transfers + * + * note: that @extradata will point to @inserted_transfers[@inserted] + * if some extra allocation is requested, so alignment will be the same + * as for spi_transfers + */ +struct spi_replaced_transfers { + spi_replaced_release_t release; + void *extradata; + struct list_head replaced_transfers; + struct list_head *replaced_after; + size_t inserted; + struct spi_transfer inserted_transfers[]; +}; + +/*---------------------------------------------------------------------------*/ + static void __spi_replace_transfers_release(struct spi_controller *ctlr, struct spi_message *msg, void *res) diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 29e21d49aafc..54fbec8acc20 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -1144,42 +1144,6 @@ static inline bool spi_is_bpw_supported(struct spi_device *spi, u32 bpw) /*---------------------------------------------------------------------------*/ -/* SPI transfer replacement methods which make use of spi_res */ - -struct spi_replaced_transfers; -typedef void (*spi_replaced_release_t)(struct spi_controller *ctlr, - struct spi_message *msg, - struct spi_replaced_transfers *res); -/** - * struct spi_replaced_transfers - structure describing the spi_transfer - * replacements that have occurred - * so that they can get reverted - * @release: some extra release code to get executed prior to - * relasing this structure - * @extradata: pointer to some extra data if requested or NULL - * @replaced_transfers: transfers that have been replaced and which need - * to get restored - * @replaced_after: the transfer after which the @replaced_transfers - * are to get re-inserted - * @inserted: number of transfers inserted - * @inserted_transfers: array of spi_transfers of array-size @inserted, - * that have been replacing replaced_transfers - * - * note: that @extradata will point to @inserted_transfers[@inserted] - * if some extra allocation is requested, so alignment will be the same - * as for spi_transfers - */ -struct spi_replaced_transfers { - spi_replaced_release_t release; - void *extradata; - struct list_head replaced_transfers; - struct list_head *replaced_after; - size_t inserted; - struct spi_transfer inserted_transfers[]; -}; - -/*---------------------------------------------------------------------------*/ - /* SPI transfer transformation methods */ extern int spi_split_transfers_maxsize(struct spi_controller *ctlr, base-commit: da21fde0fdb393c2fbe0ae0735cc826cd55fd46f -- 2.30.2