summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill McVicker <willmcvicker@google.com>2022-05-04 16:46:55 -0700
committerWill McVicker <willmcvicker@google.com>2022-05-25 10:12:31 -0700
commiteb2c31258af00e756114e33738959d8eaa7d8b51 (patch)
tree21b50c6e7fc0c61c3a6218efa942f918260017c9
parent6823ff9fc694ae8b839184f8f3afcd1bd9660335 (diff)
downloaduwb-eb2c31258af00e756114e33738959d8eaa7d8b51.tar.gz
Revert "dw3000: Fix spi_driver remove function"
This reverts commit fcc98f9f1d073577ad4024f69c0ad87347a37c5f. This is from android-gs-raviole-mainline and isn't compatible with the 5.15 kernel. Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: Ife9fa54b9b2260cc60ab1c1e0194253735bbfbbe
-rw-r--r--kernel/drivers/net/ieee802154/dw3000_spi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/drivers/net/ieee802154/dw3000_spi.c b/kernel/drivers/net/ieee802154/dw3000_spi.c
index dce30bc..7c1e052 100644
--- a/kernel/drivers/net/ieee802154/dw3000_spi.c
+++ b/kernel/drivers/net/ieee802154/dw3000_spi.c
@@ -224,7 +224,7 @@ err_alloc_hw:
* module and them free all remaining resources.
*
*/
-static void dw3000_spi_remove(struct spi_device *spi)
+static int dw3000_spi_remove(struct spi_device *spi)
{
struct dw3000 *dw = spi_get_drvdata(spi);
@@ -249,6 +249,8 @@ static void dw3000_spi_remove(struct spi_device *spi)
/* Release the mcps 802.15.4 device */
dw3000_mcps_free(dw);
+
+ return 0;
}
enum { DW3000,