From f66f5edf1080dedb94944fd897793a342b7ef6af Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jul 2024 09:58:06 +0000 Subject: [PATCH] Revert "spi: Merge spi_controller.{slave,target}_abort()" This reverts commit 2f5e8322cd809adae9d9654425a79f3235768089 which is commit 6c6871cdaef96361f6b79a3e45d451a6475df4d6 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: Ie74bf735e9102ae636f40b30ceff41e097f667e4 Signed-off-by: Greg Kroah-Hartman --- include/linux/spi/spi.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index d8de829b2f95..fe4fcdc91a93 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -682,10 +682,8 @@ struct spi_controller { struct spi_message *message); int (*unprepare_message)(struct spi_controller *ctlr, struct spi_message *message); - union { - int (*slave_abort)(struct spi_controller *ctlr); - int (*target_abort)(struct spi_controller *ctlr); - }; + int (*slave_abort)(struct spi_controller *ctlr); + int (*target_abort)(struct spi_controller *ctlr); /* * These hooks are for drivers that use a generic implementation