summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/nfcmrvl
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-02-28 10:41:31 -0800
committerJakub Kicinski <kuba@kernel.org>2022-02-28 10:43:07 -0800
commite499cd3102b280bce3a1acaf3f92e8163e53cb3b (patch)
treec842396c77adda68bce761c837d777ee7ab15e77 /drivers/nfc/nfcmrvl
parent98fffd72f934c48e7e69e21e1394de0b5aed49b4 (diff)
parenta0386bba70934d42f586eaf68b21d5eeaffa7bd0 (diff)
downloadlinux-e499cd3102b280bce3a1acaf3f92e8163e53cb3b.tar.gz
linux-e499cd3102b280bce3a1acaf3f92e8163e53cb3b.tar.bz2
linux-e499cd3102b280bce3a1acaf3f92e8163e53cb3b.zip
Merge tag 'spi-remove-void' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Mark Brown says: ==================== spi: Make remove() return void This series from Uwe Kleine-König converts the spi remove function to return void since there is nothing useful that we can do with a failure and it as more buses are converted it'll enable further work on the driver core. ==================== Link: https://lore.kernel.org/r/20220228173957.1262628-2-broonie@kernel.org/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/nfc/nfcmrvl')
-rw-r--r--drivers/nfc/nfcmrvl/spi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c
index 5b833a9a83f8..a38e2fcdfd39 100644
--- a/drivers/nfc/nfcmrvl/spi.c
+++ b/drivers/nfc/nfcmrvl/spi.c
@@ -174,12 +174,11 @@ static int nfcmrvl_spi_probe(struct spi_device *spi)
return 0;
}
-static int nfcmrvl_spi_remove(struct spi_device *spi)
+static void nfcmrvl_spi_remove(struct spi_device *spi)
{
struct nfcmrvl_spi_drv_data *drv_data = spi_get_drvdata(spi);
nfcmrvl_nci_unregister_dev(drv_data->priv);
- return 0;
}
static const struct of_device_id of_nfcmrvl_spi_match[] __maybe_unused = {