summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/microread
diff options
context:
space:
mode:
authorUwe Kleine-König <uwe@kleine-koenig.org>2021-02-08 08:37:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-09 09:30:16 +0100
commitbf5c9cc8ad7fffd1f72df3baa5870449e4c16d1b (patch)
tree119fb30a4d3960bd6198ab8dbfa0027d8e2dd882 /drivers/nfc/microread
parentmei: bus: simplify mei_cl_device_remove() (diff)
downloadlinux-bf5c9cc8ad7fffd1f72df3baa5870449e4c16d1b.tar.xz
linux-bf5c9cc8ad7fffd1f72df3baa5870449e4c16d1b.zip
mei: bus: change remove callback to return void
The driver core ignores the return value of mei_cl_device_remove() so passing an error value doesn't solve any problem. As most mei drivers' remove callbacks return 0 unconditionally and returning a different value doesn't have any effect, change this prototype to return void and return 0 unconditionally in mei_cl_device_remove(). The only driver that could return an error value is modified to emit an explicit warning in the error case. Acked-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> Link: https://lore.kernel.org/r/20210208073705.428185-3-uwe@kleine-koenig.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc/microread')
-rw-r--r--drivers/nfc/microread/mei.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c
index 5dad8847a9b3..8fa7771085eb 100644
--- a/drivers/nfc/microread/mei.c
+++ b/drivers/nfc/microread/mei.c
@@ -44,15 +44,13 @@ static int microread_mei_probe(struct mei_cl_device *cldev,
return 0;
}
-static int microread_mei_remove(struct mei_cl_device *cldev)
+static void microread_mei_remove(struct mei_cl_device *cldev)
{
struct nfc_mei_phy *phy = mei_cldev_get_drvdata(cldev);
microread_remove(phy->hdev);
nfc_mei_phy_free(phy);
-
- return 0;
}
static struct mei_cl_device_id microread_mei_tbl[] = {